core197: Ship apache

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

diff --git a/config/rootfiles/core/197/update.sh b/config/rootfiles/core/197/update.sh
index 63250a8265d9e24f4067fb7c7217b89811a9e5d3..8e109d140d425dac89e9f8517b91d5b03dad76e6 100644 (file)
--- a/config/rootfiles/core/197/update.sh
+++ b/config/rootfiles/core/197/update.sh
@@ -47,6 +47,7 @@ done
 /usr/local/bin/openvpnctrl -k
 /usr/local/bin/openvpnctrl -kn2n
 /etc/init.d/ipsec stop
+/etc/init.d/apache stop
 
 KVER="xxxKVERxxx"
 
@@ -152,6 +153,7 @@ fi
 /usr/local/bin/sshctrl
 
 # Restart services
+/etc/init.d/apache start
 /etc/init.d/firewall restart
 /etc/init.d/unbound restart
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
@@ -161,9 +163,6 @@ fi
 /etc/init.d/openvpn-rw start
 /etc/init.d/collectd restart
 
-# Reload Apache2
-/etc/init.d/apache reload
-
 # Build initial ramdisks
 dracut --regenerate-all --force
 KVER="xxxKVERxxx"