Core Update 173: Ship and restart Apache

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/core/173/filelists/apache2 b/config/rootfiles/core/173/filelists/apache2
new file mode 120000 (symlink)
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file

diff --git a/config/rootfiles/core/173/update.sh b/config/rootfiles/core/173/update.sh
index e268d143e09004aec3c4c8104e80175945d68039..698c2399fb5fe3b99f96effa8f4f0e19d1d967a5 100644 (file)
--- a/config/rootfiles/core/173/update.sh
+++ b/config/rootfiles/core/173/update.sh
@@ -44,6 +44,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/etc/rc.d/init.d/apache stop
 /etc/rc.d/init.d/ipsec stop
 /usr/local/bin/openvpnctrl -k
 /usr/local/bin/openvpnctrl -kn2n
@@ -121,12 +122,13 @@ done
 /usr/local/bin/filesystem-cleanup
 
 # Start services
+/etc/rc.d/init.d/apache start
 if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
        /usr/local/bin/openvpnctrl -s
        /usr/local/bin/openvpnctrl -sn2n
 fi
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
-       /etc/init.d/ipsec start
+       /etc/rc.d/init.d/ipsec start
 fi
 
 # Regenerate all initrds