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 6646be5a53c2fa4846f6403d887a2975469800f6 (commit) via cb82fb206bbff70d8b2a63a3a2036642b46f9809 (commit) via 06a076e0d881f2a4f6c6c57913cb8bf487cf9f2e (commit) via 69a8ce7d9782eeace26c92584a0aa524b573aa43 (commit) from 0ab3e07f9d96074eefb0ecbc4359f90feb520635 (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 6646be5a53c2fa4846f6403d887a2975469800f6 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 11 17:13:51 2015 +0200
make.sh: Change PAKFIRE_CORE to 91
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cb82fb206bbff70d8b2a63a3a2036642b46f9809 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 11 17:13:34 2015 +0200
core91: Require reboot
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 06a076e0d881f2a4f6c6c57913cb8bf487cf9f2e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 11 17:12:16 2015 +0200
core91: Restart IPsec
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 69a8ce7d9782eeace26c92584a0aa524b573aa43 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 11 17:10:12 2015 +0200
core91: Call update-lang-cache with full path
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/91/update.sh | 15 +++++++++++++-- make.sh | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh index b332ddd..1e55e8b 100644 --- a/config/rootfiles/core/91/update.sh +++ b/config/rootfiles/core/91/update.sh @@ -31,6 +31,9 @@ do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done
+# Stop services +/etc/init.d/ipsec stop + # Extract files extract_files
@@ -39,12 +42,20 @@ mkdir -p /srv/web/ipfire/html/{accounting,graphs} chmod 777 /srv/web/ipfire/html/{accounting,graphs}
# Update Language cache -update-lang-cache +/usr/local/bin/update-lang-cache + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
sync
+# Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + # This update need a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot
# Finish /etc/init.d/fireinfo start diff --git a/make.sh b/make.sh index 3d43603..29245bc 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number CORE="91" # Core Level (Filename) -PAKFIRE_CORE="90" # Core Level (PAKFIRE) +PAKFIRE_CORE="91" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive -- IPFire 2.x development tree