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 126246a8caba9de88c85603dda188fbb35cfc917 (commit) from 846571ac8455c663fc75b0970eb76c4a92eea3be (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 126246a8caba9de88c85603dda188fbb35cfc917 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Nov 14 18:28:10 2010 +0100

Fix ipsec.conf for strongswan 4.5 (ikev2 was now default).

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

Summary of changes: config/rootfiles/core/test/filelists/files | 2 ++ html/cgi-bin/vpnmain.cgi | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files index 2a6d23b..5e17384 100644 --- a/config/rootfiles/core/test/filelists/files +++ b/config/rootfiles/core/test/filelists/files @@ -3,5 +3,7 @@ etc/rc.d/init.d/checkfstab etc/rc.d/init.d/squid srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/speed.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/images/urlfilter/copy.gif usr/local/bin/rebuild-initrd usr/bin/ldd diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index f303cfb..5fb6055 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -384,6 +384,9 @@ sub writeipsecfiles { print CONF "\tpfsgroup=$lconfighash{$key}[23]\n"; }

+ # IKE V1 + print CONF "\tkeyexchange=ikev1\n"; + # Lifetimes print CONF "\tikelifetime=$lconfighash{$key}[16]h\n" if ($lconfighash{$key}[16]); print CONF "\tkeylife=$lconfighash{$key}[17]h\n" if ($lconfighash{$key}[17]);

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