[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1159f711c8676d63ce9e2d100790031385eb01e3

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3265 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  1159f711c8676d63ce9e2d100790031385eb01e3 (commit)
      from  1cd62a8d3dd6b340adb2208761f46d2d0de8f672 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1159f711c8676d63ce9e2d100790031385eb01e3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Aug 6 12:09:44 2016 +0200

    core104: add changed files
    
    customservices and openssh.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/104/filelists/files                   | 1 +
 config/rootfiles/{oldcore/99 => core/104}/filelists/openssh | 0
 config/rootfiles/core/104/update.sh                         | 8 +++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)
 copy config/rootfiles/{oldcore/99 => core/104}/filelists/openssh (100%)

Difference in files:
diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files
index 8c90a3f..c172c14 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 0000000..d8c77fd
--- /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 874b411..3988a9d 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


hooks/post-receive
--
IPFire 2.x development tree