This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 1294c52ca5d01e9293b37b2f301c0c873098ab83 (commit) from 112a09508e9538d67af9e60c207724eca49b1c51 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 1294c52ca5d01e9293b37b2f301c0c873098ab83 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 6 11:48:49 2017 +0100

core115: Include captive portal in updater

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

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/115/filelists/bootstrap | 1 + config/rootfiles/core/115/filelists/files | 19 +++++++++++++++++++ .../rootfiles/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

Difference in files: diff --git a/config/rootfiles/core/115/filelists/bootstrap b/config/rootfiles/core/115/filelists/bootstrap new file mode 120000 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 d3c27e8..122d4cd 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 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 95260c8..50dafe1 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 <<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

hooks/post-receive -- IPFire 2.x development tree