From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 6 Aug 2016 10:09:44 +0000 (+0200)
Subject: core104: add changed files
X-Git-Tag: v2.19-core104~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1159f711c8676d63ce9e2d100790031385eb01e3;p=ipfire-2.x.git

core104: add changed files

customservices and openssh.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files
index 8c90a3f0cc..c172c142da 100644
--- a/config/rootfiles/core/104/filelists/files
+++ b/config/rootfiles/core/104/filelists/files
@@ -10,4 +10,5 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
 var/ipfire/langs
+var/ipfire/fwhosts/customservices.default
 var/ipfire/updatexlrator/bin/download
diff --git a/config/rootfiles/core/104/filelists/openssh b/config/rootfiles/core/104/filelists/openssh
new file mode 120000
index 0000000000..d8c77fd8e7
--- /dev/null
+++ b/config/rootfiles/core/104/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh
index 874b411769..3988a9dabd 100644
--- a/config/rootfiles/core/104/update.sh
+++ b/config/rootfiles/core/104/update.sh
@@ -132,12 +132,18 @@ esac
 /etc/init.d/snort stop
 /etc/init.d/squid stop
 /etc/init.d/dnsmasq stop
+/etc/init.d/sshd stop
 /etc/init.d/ipsec stop
 /etc/init.d/apache stop
 
 # Extract files
 tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
 
+# Update customservices
+cp /var/ipfire/fwhosts/customservices /var/ipfire/fwhosts/customservices.old
+echo 35,Submission (TCP),587,TCP,BLANK,0 >> /var/ipfire/fwhosts/customservices
+echo 36,SSMTP,465,TCP,BLANK,0 >> /var/ipfire/fwhosts/customservices
+
 # Remove some old files
 rm -f /bin/groups /lib/libshadow.so.0*
 
@@ -174,7 +180,7 @@ fi
 /etc/init.d/collectd start
 /etc/init.d/apache start
 /etc/init.d/dnsmasq start
-/etc/init.d/sshd restart
+/etc/init.d/sshd start
 /etc/init.d/squid start
 /etc/init.d/snort start
 if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then