From 1294c52ca5d01e9293b37b2f301c0c873098ab83 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 6 Oct 2017 11:48:49 +0100 Subject: [PATCH] core115: Include captive portal in updater Signed-off-by: Michael Tremer --- config/rootfiles/core/115/filelists/bootstrap | 1 + config/rootfiles/core/115/filelists/files | 19 +++++++++++++++++++ .../core/115/filelists/ubuntu-font-family | 1 + config/rootfiles/core/115/update.sh | 4 ++++ 4 files changed, 25 insertions(+) create mode 120000 config/rootfiles/core/115/filelists/bootstrap create mode 120000 config/rootfiles/core/115/filelists/ubuntu-font-family diff --git a/config/rootfiles/core/115/filelists/bootstrap b/config/rootfiles/core/115/filelists/bootstrap new file mode 120000 index 0000000000..ed985a674a --- /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 d3c27e8a1c..122d4cd42a 100644 --- 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 index 0000000000..61835198d4 --- /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 95260c88c1..50dafe1aae 100644 --- 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 <> /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 -- 2.39.2