From: Christoph Anderegg <christoph@christoph-anderegg.ch>
Date: Mon, 2 Mar 2015 21:10:13 +0000 (+0100)
Subject: vpnmain.cgi: Added inclusion of ipsec.user-post.conf to the end of ipsec.conf in... 
X-Git-Tag: v2.17-core89~43^2~1
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=165b25b2dc8fce3dbba64711eab1eed709ffb0a5;hp=09e3b0fa356c087b27ca7197024bf0210455a73c

vpnmain.cgi: Added inclusion of ipsec.user-post.conf to the end of ipsec.conf in order to allow connection parameters to be overwritten in ipsec.user.conf.
---

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index f5ec50079a..d86a613d1f 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -437,6 +437,14 @@ sub writeipsecfiles {
 	}
 	print CONF "\n";
     }#foreach key
+
+    # Add post user includes to config file
+    # After the GUI-connections allows to patch connections.
+    if (-e "/etc/ipsec.user-post.conf") {
+        print CONF "include /etc/ipsec.user-post.conf\n";
+        print CONF "\n";
+    }
+
     print SECRETS $last_secrets if ($last_secrets);
     close(CONF);
     close(SECRETS);