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

diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files
index 2a6d23ba8be29e8240d8a2185fc4f5fd7f6684c0..5e173848d1eea7f0f0c7499ba59c5b93c6f04e4c 100644 (file)
--- 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 f303cfbc2cb0ead196690353b841788b1efe57e9..5fb60558fb09f44242c19089c6fda487b7c94874 100644 (file)
--- 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]);