From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 5 Jun 2008 20:07:48 +0000 (+0200)
Subject: imported esniper changes
X-Git-Tag: v2.3-beta1~48^2~15
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c4e44c7b53e17b9d1860ddf3e9f0570cbc473a24

imported esniper changes
---

diff --git a/config/backup/includes/esniper b/config/backup/includes/esniper
new file mode 100644
index 0000000000..14434aaae3
--- /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 2e809f7216..e1c4dd48bc 100644
--- 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 45bc6d5b16..f95234a6f4 100644
--- 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 83c85f4c35..db215c1213 100644
--- 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 48ee37db49..d0a24a6497 100644
--- 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 ac7ec2f360..d5fa162ef1 100644
--- 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