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, core115 has been updated via e4e488bef6c40d532ec2ed347a446c3ef943c0d7 (commit) via c21d6eb8ed05ccf66e5fe8e6a4feb3111db67e10 (commit) via df6399241509586e6ea86fb88bdf0fc01190fea4 (commit) from 9064ba72fe03d324478b8c321f4368192e8f551c (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 e4e488bef6c40d532ec2ed347a446c3ef943c0d7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Oct 23 16:14:25 2017 +0200

core115: add setup to update

this fix admin passwort set problem.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit c21d6eb8ed05ccf66e5fe8e6a4feb3111db67e10 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Oct 23 16:13:09 2017 +0200

core115: add patch of openvpnctrl

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit df6399241509586e6ea86fb88bdf0fc01190fea4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Oct 23 16:11:36 2017 +0200

core115: fix typo at apache start

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

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

Summary of changes: config/rootfiles/core/115/filelists/files | 1 + config/rootfiles/core/115/update.sh | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/115/filelists/files b/config/rootfiles/core/115/filelists/files index d3e2958..d88d4a1 100644 --- a/config/rootfiles/core/115/filelists/files +++ b/config/rootfiles/core/115/filelists/files @@ -15,6 +15,7 @@ srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/captive usr/bin/captive-cleanup +usr/bin/setup usr/local/bin/backupiso usr/local/bin/captivectrl usr/local/bin/wirelessctrl diff --git a/config/rootfiles/core/115/update.sh b/config/rootfiles/core/115/update.sh index 91bb808..2806984 100644 --- a/config/rootfiles/core/115/update.sh +++ b/config/rootfiles/core/115/update.sh @@ -32,8 +32,8 @@ for (( i=1; i<=$core; i++ )); do done

# Stop services -openvpnctrl -k -openvpnctrl -kn2n +/usr/local/bin/openvpnctrl -k +/usr/local/bin/openvpnctrl -kn2n /etc/rc.d/init.d/apache stop

# Extract files @@ -51,9 +51,9 @@ ldconfig /usr/local/bin/update-lang-cache

# Start services -/etc/rc.d/init.d/apache2 start -openvpnctrl -s -openvpnctrl -sn2n +/etc/rc.d/init.d/apache start +/usr/local/bin/openvpnctrl -s +/usr/local/bin/openvpnctrl -sn2n

grep -q "captivectrl" /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig # Cleanup captive clients

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