core115: Include captive portal in updater

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

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

diff --git a/config/rootfiles/core/115/filelists/files b/config/rootfiles/core/115/filelists/files
index d3c27e8a1cfebe2dee8e8c67ed68185b59e305a1..122d4cd42af6a1ad8c3f0cce8da8122c5a3b6b6f 100644 (file)
--- a/config/rootfiles/core/115/filelists/files
+++ b/config/rootfiles/core/115/filelists/files
@@ -1,3 +1,22 @@
 etc/system-release
 etc/issue
+etc/httpd/conf/vhosts.d/captive.conf
+etc/rc.d/init.d/firewall
+srv/web/ipfire/cgi-bin/captive/index.cgi
+srv/web/ipfire/cgi-bin/captive/logo.cgi
+srv/web/ipfire/cgi-bin/captive/redirect.cgi
+srv/web/ipfire/cgi-bin/captive.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/html/captive
+usr/bin/captive-cleanup
+usr/local/bin/captivectrl
+usr/local/bin/wirelessctrl
+var/ipfire/backup/include
+var/ipfire/captive
+var/ipfire/general-functions.pl
+var/ipfire/lang.pl
+var/ipfire/langs
+var/ipfire/menu.d/30-network.menu
+var/ipfire/modem-lib.pl
+var/ipfire/network-functions.pl
+var/log/httpd/captive

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

diff --git a/config/rootfiles/core/115/update.sh b/config/rootfiles/core/115/update.sh
index 95260c88c1e69a22ef6165ce730c699fe2577b12..50dafe1aae7af4f6f22c1935bbe8c306b230998c 100644 (file)
--- a/config/rootfiles/core/115/update.sh
+++ b/config/rootfiles/core/115/update.sh
@@ -57,6 +57,10 @@ grep -q "captivectrl" /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/
 EOF
 fcrontab -z
 
+# Load captive portal configuration
+/etc/rc.d/init.d/apache2 reload
+/etc/rc.d/init.d/firewall restart
+
 # This update need a reboot...
 #touch /var/run/need_reboot