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, master has been updated via bf22df04a519654ab96d3fcf4f6efddc953736cc (commit) from 7a14ad3bb7b7639df0de04476233017fe9619d4a (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 bf22df04a519654ab96d3fcf4f6efddc953736cc Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 30 10:46:57 2010 +0100

updater: fix ipsec start if it is disabled.

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

Summary of changes: config/rootfiles/core/44/update.sh | 5 +++-- langs/de/cgi-bin/de.pl | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh index 47773fb..1096440 100644 --- a/config/rootfiles/core/44/update.sh +++ b/config/rootfiles/core/44/update.sh @@ -200,8 +200,9 @@ done < /var/ipfire/extrahd/devices.org # /etc/init.d/squid start /etc/init.d/snort start -/etc/init.d/ipsec start - +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi

# Add pakfire and fireinfo cronjobs... grep -v "# fireinfo" /var/spool/cron/root.orig | diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index dca8f44..bbf9d30 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -846,7 +846,7 @@ 'global settings' => 'Globale Einstellungen', 'gpl i accept these terms and conditions' => 'Ich akzeptiere diese Bedingungen und Konditionen', 'gpl license agreement' => 'Lizenz Vereinbarung', -'gpl please read carefully the general public license and accept it below' => 'Bitte die General Public License genau lesen und diese unten akzeptiere', +'gpl please read carefully the general public license and accept it below' => 'Bitte die General Public License genau lesen und diese unten akzeptieren.', 'gpl unofficial translation of the general public license v3' => 'Inoffizielle Übersetzung der General Public License v3', 'graph' => 'Diagramm', 'graph per' => 'pro',

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