imported esniper changes

diff --git a/config/backup/includes/esniper b/config/backup/includes/esniper
new file mode 100644 (file)
index 0000000..14434aa
--- /dev/null
+++ b/config/backup/includes/esniper
@@ -0,0 +1,5 @@
+/srv/web/esniper/.htaccess
+/srv/web/esniper/.config.php
+/srv/web/esniper/.config.state.php
+/srv/web/esniper/local/
+/srv/web/esniper/.run/

diff --git a/config/httpd/vhosts.d/esniper.conf b/config/httpd/vhosts.d/esniper.conf
index 2e809f7216e8892efa91bdbd7baf4e0bba744ec1..e1c4dd48bce666b5172d59c5df151b4fe1a576c9 100644 (file)
--- a/config/httpd/vhosts.d/esniper.conf
+++ b/config/httpd/vhosts.d/esniper.conf
@@ -1,6 +1,12 @@
 Listen 1006
 
 <VirtualHost *:1006>
+
+       SSLEngine on
+       SSLProtocol all -SSLv2
+       SSLCipherSuite ALL:!ADH:!EXPORT56:!eNULL:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP
+       SSLCertificateFile /etc/httpd/server.crt
+       SSLCertificateKeyFile /etc/httpd/server.key
        
        DocumentRoot /srv/web/esniper
        

diff --git a/config/rootfiles/packages/esniper b/config/rootfiles/packages/esniper
index 45bc6d5b169930441a035c4c62987ed6148b02dc..f95234a6f40de2394eec3360b497e3313f2a9d08 100644 (file)
--- a/config/rootfiles/packages/esniper
+++ b/config/rootfiles/packages/esniper
@@ -1,3 +1,4 @@
+var/ipfire/backup/addons/includes/esniper
 etc/httpd/conf/vhosts.d/esniper.conf
 #srv/web/esniper
 #srv/web/esniper/CHANGELOG

diff --git a/lfs/esniper b/lfs/esniper
index 83c85f4c35aee81f7eafd088d8b21a52b8001bde..db215c1213090ac4ea5eb94da6c7bd81f44067ab 100644 (file)
--- a/lfs/esniper
+++ b/lfs/esniper
@@ -85,5 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -mkdir /srv/web/esniper
        tar xvfz $(DIR_DL)/es-f_1.0.0.tgz -C /srv/web/esniper
        chown -Rv nobody.nobody /srv/web/esniper
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/esniper \
+                        /var/ipfire/backup/addons/includes/esniper
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/paks/esniper/install.sh b/src/paks/esniper/install.sh
index 48ee37db4929ab6554e97ebfdb56d9a3eb73cfc8..d0a24a6497fec11c03b15ee612f26f9345be2d95 100644 (file)
--- a/src/paks/esniper/install.sh
+++ b/src/paks/esniper/install.sh
@@ -23,6 +23,7 @@
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
+restore_backup ${NAME}
 useradd -s /bin/false esniper
 grep -v "esniper" /etc/sudoers > /tmp/sudoers
 echo "# esniper user" >> /tmp/sudoers

diff --git a/src/paks/esniper/uninstall.sh b/src/paks/esniper/uninstall.sh
index ac7ec2f360c79caac119a6986145ba5f7074860e..d5fa162ef133a0c9dee81802ff414c4c4bc1cf8a 100644 (file)
--- a/src/paks/esniper/uninstall.sh
+++ b/src/paks/esniper/uninstall.sh
@@ -22,6 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+make_backup ${NAME}
 remove_files
 grep -v "esniper" /etc/sudoers > /tmp/sudoers
 mv /tmp/sudoers /etc/sudoers