public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <20130811074312.3BBC320310@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 3761 bytes --]

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 <arne_f(a)ipfire.org>
Date:   Sun Aug 11 09:40:54 2013 +0200

    core72: allow to update "ovpn verify script".
    
    Don't forget to readd this exclude to next core updater to prevent overwrite
    the user ca at a openvpn update.

commit 9d838dad03acbe38447df8db970bc472f3abe584
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 11 09:40:03 2013 +0200

    core72: add ovpnmain.cgi to update.

commit 93443c472f1e7f8bf9df4f5daa3cbc16ac20e182
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Aug 11 09:34:52 2013 +0200

    core72: stop/start squid while update.

commit b9c6c0ecd3b2eb67025dcfcc7ae5a2920c7440c8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
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 => 100644 html/cgi-bin/wirelessclient.cgi

Difference in files:
diff --git a/config/rootfiles/core/72/exclude b/config/rootfiles/core/72/exclude
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/update.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
 
 #
 #Extract files
@@ -44,12 +45,13 @@ extract_files
 
 #
 #Start services
+/etc/init.d/squid start
 /etc/init.d/snort start
 ipsec start
 
 #
 #Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 sync
 
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

                 reply	other threads:[~2013-08-11  7:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130811074312.3BBC320310@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox