Updater: add keyexchange=ikev1 to ipsec.conf.

diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh
index 1efccb7b84380b2c89b3b7c4e1f2ffe05907a18c..c0abbe766c100ddaafc9882e2b37d6942b27a7b4 100644 (file)
--- a/config/rootfiles/core/44/update.sh
+++ b/config/rootfiles/core/44/update.sh
@@ -85,6 +85,8 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
 #
 /etc/init.d/snort stop
 /etc/init.d/squid stop
+/etc/init.d/ipsec stop
+
 #
 #
 # Remove old snort...
@@ -164,11 +166,17 @@ if [ ! -z $SWAP ]; then
        echo "WARNING! swap not found!!!"
 fi
 
+#new strongswan need keyexchange=ikev1 because this is not default anymore
+mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org
+grep -v "keyexchange=ikev1" /var/ipfire/vpn/ipsec.conf.org > /var/ipfire/vpn/ipsec.conf
+sed -i "s|^conn [A-Za-z].*$|&\n\tkeyexchange=ikev1|g" /var/ipfire/vpn/ipsec.conf
+
 #
 # Start services
 #
 /etc/init.d/squid start
 /etc/init.d/snort start
+/etc/init.d/ipsec start
 
 
 # Add pakfire and fireinfo cronjobs...