From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Sep 2018 12:57:00 +0000 (+0200)
Subject: strongswan: Add network.conf with our own settings
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00a97de355cf5da516e84c5abaccf1daf93d0f23;p=ipfire-3.x.git

strongswan: Add network.conf with our own settings

These settings are required to make everything in the
network package work.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/strongswan/network.conf b/strongswan/network.conf
new file mode 100644
index 000000000..635a5fdc7
--- /dev/null
+++ b/strongswan/network.conf
@@ -0,0 +1,12 @@
+#
+# Configuration options for IPFire
+#
+
+charon {
+	# Send Cisco Unity vendor ID payload (IKEv1 only)
+	cisco_unity = yes
+
+	# Install routes into a separate routing table for established IPsec
+	# tunnels.
+	install_routes = no
+}
diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm
index 62795d775..12505baf0 100644
--- a/strongswan/strongswan.nm
+++ b/strongswan/strongswan.nm
@@ -5,7 +5,7 @@
 
 name       = strongswan
 version    = 5.6.3
-release    = 1
+release    = 2
 
 groups     = Networking/VPN
 url        = http://www.strongswan.org/
@@ -86,6 +86,10 @@ build
 	install_cmds
 		mv -v %{BUILDROOT}%{unitdir}/strongswan{-swanctl,}.service
 
+		# Install network settings
+		install -v -m 644 %{DIR_SOURCE}/network.conf \
+			%{BUILDROOT}%{sysconfdir}/strongswan.d/
+
 		# Create directory for connections
 		mkdir -pv %{BUILDROOT}%{sysconfdir}/swanctl/connections
 		echo "include connections/*.conf" > \