core190: Ship Apache configuration and updated initscript

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

diff --git a/config/rootfiles/core/190/filelists/files b/config/rootfiles/core/190/filelists/files
index 61317e49582e23e714167456b6302985bce9c713..c2f0a122c31a20de8db648a005ee30e99921530f 100644 (file)
--- a/config/rootfiles/core/190/filelists/files
+++ b/config/rootfiles/core/190/filelists/files
@@ -1,8 +1,11 @@
 etc/collectd.conf
 etc/collectd.d
+etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
+etc/rc.d/init.d/apache
 etc/rc.d/init.d/collectd
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
+var/ipfire/backup/include
 var/ipfire/network-functions.pl

diff --git a/config/rootfiles/core/190/update.sh b/config/rootfiles/core/190/update.sh
index b9e1fd84207b43540a777f1c451559878deab01e..23ed84e2db63a5df1bd28d3e83e6e5972a66be6c 100644 (file)
--- a/config/rootfiles/core/190/update.sh
+++ b/config/rootfiles/core/190/update.sh
@@ -56,6 +56,7 @@ if [ -e "/etc/collectd.custom" ]; then
 fi
 
 # Start services
+/etc/rc.d/init.d/apache restart
 /etc/init.d/collectd restart
 /etc/init.d/sshd restart