core115: Include captive portal in updater
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 6 Oct 2017 10:48:49 +0000 (11:48 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 6 Oct 2017 10:48:49 +0000 (11:48 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/core/115/filelists/bootstrap [new symlink]
config/rootfiles/core/115/filelists/files
config/rootfiles/core/115/filelists/ubuntu-font-family [new symlink]
config/rootfiles/core/115/update.sh

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
@@ -0,0 +1 @@
+../../../common/bootstrap
\ No newline at end of file
index d3c27e8..122d4cd 100644 (file)
@@ -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
@@ -0,0 +1 @@
+../../../common/ubuntu-font-family
\ No newline at end of file
index 95260c8..50dafe1 100644 (file)
@@ -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