From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. bdc9033f08bce0c76f7d134de4a21e2b11f3671e Date: Sun, 11 Aug 2013 09:42:55 +0200 Message-ID: <20130811074312.3BBC320310@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7361808820487212704==" List-Id: --===============7361808820487212704== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 bdc9033f08bce0c76f7d134de4a21e2b11f3671e (commit) via 9d838dad03acbe38447df8db970bc472f3abe584 (commit) via 93443c472f1e7f8bf9df4f5daa3cbc16ac20e182 (commit) via b9c6c0ecd3b2eb67025dcfcc7ae5a2920c7440c8 (commit) from f2665db1adb48ecbdfc59619c4693525be21974a (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 bdc9033f08bce0c76f7d134de4a21e2b11f3671e Author: Arne Fitzenreiter Date: Sun Aug 11 09:40:54 2013 +0200 core72: allow to update "ovpn verify script". =20 Don't forget to readd this exclude to next core updater to prevent overwr= ite the user ca at a openvpn update. commit 9d838dad03acbe38447df8db970bc472f3abe584 Author: Arne Fitzenreiter Date: Sun Aug 11 09:40:03 2013 +0200 core72: add ovpnmain.cgi to update. commit 93443c472f1e7f8bf9df4f5daa3cbc16ac20e182 Author: Arne Fitzenreiter Date: Sun Aug 11 09:34:52 2013 +0200 core72: stop/start squid while update. commit b9c6c0ecd3b2eb67025dcfcc7ae5a2920c7440c8 Author: Arne Fitzenreiter Date: Sun Aug 11 09:33:25 2013 +0200 core72: add language files to update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/72/exclude | 1 - config/rootfiles/core/72/filelists/files | 2 ++ config/rootfiles/core/72/update.sh | 4 +++- html/cgi-bin/wirelessclient.cgi | 0 4 files changed, 5 insertions(+), 2 deletions(-) mode change 100755 =3D> 100644 html/cgi-bin/wirelessclient.cgi Difference in files: diff --git a/config/rootfiles/core/72/exclude b/config/rootfiles/core/72/excl= ude index a524207..e8ae55d 100644 --- a/config/rootfiles/core/72/exclude +++ b/config/rootfiles/core/72/exclude @@ -10,7 +10,6 @@ etc/ipsec.user.secrets var/log/cache var/updatecache etc/localtime -var/ipfire/ovpn etc/ssh/ssh_config etc/ssh/sshd_config etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/72/filelists/files b/config/rootfiles/core= /72/filelists/files index 47eb358..e8f90a1 100644 --- a/config/rootfiles/core/72/filelists/files +++ b/config/rootfiles/core/72/filelists/files @@ -4,6 +4,8 @@ etc/rc.d/init.d/firewall srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi usr/local/bin/openvpnctrl usr/local/bin/setddns.pl +var/ipfire/langs var/ipfire/ovpn/verify diff --git a/config/rootfiles/core/72/update.sh b/config/rootfiles/core/72/up= date.sh index 6ed39c5..15d1bf2 100644 --- a/config/rootfiles/core/72/update.sh +++ b/config/rootfiles/core/72/update.sh @@ -36,6 +36,7 @@ done #Stop services ipsec stop /etc/init.d/snort stop +/etc/init.d/squid stop =20 # #Extract files @@ -44,12 +45,13 @@ extract_files =20 # #Start services +/etc/init.d/squid start /etc/init.d/snort start ipsec start =20 # #Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" =20 sync =20 diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi old mode 100755 new mode 100644 hooks/post-receive -- IPFire 2.x development tree --===============7361808820487212704==--