charon-tkm: Don't use starter/stroke with charon-tkm anymore

For the tests, the unused init script that was used before switching to charon-systemd is repurposed to manage the daemon.
2021-01-11 15:28:01 +01:00
parent b322539ef5
commit 16fcdb460a
70 changed files with 449 additions and 342 deletions
@@ -1,22 +0,0 @@
-# /etc/ipsec.conf - strongSwan IPsec configuration file
-
-config setup
-
-conn %default
-	ikelifetime=60m
-	keylife=20m
-	rekeymargin=3m
-	keyingtries=1
-	keyexchange=ikev2
-	mobike=no
-
-conn host-host
-	left=PH_IP_CAROL
-	leftcert=carolCert.pem
-	[email protected]
-	right=PH_IP_SUN
-	rightid=sun.strongswan.org
-	ike=aes256-sha512-modp4096!
-	esp=aes256-sha512-modp4096!
-	type=transport
-	auto=add
@@ -1,5 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file

-charon {
-  load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown
+swanctl {
+  load = pem pkcs1 gmp x509 revocation random
+}
+
+charon-systemd {
+  load = aes sha1 sha2 pem pkcs1 gmp random nonce x509 curl revocation hmac xcbc vici kernel-netlink socket-default updown
 }
@@ -0,0 +1,25 @@
+connections {
+
+  host-host {
+    local_addrs  = PH_IP_CAROL
+    remote_addrs = PH_IP_SUN
+
+    proposals = aes256-sha512-modp4096
+
+    local {
+      auth = pubkey
+      certs = carolCert.pem
+      id = [email protected]
+    }
+    remote {
+      auth = pubkey
+      id = sun.strongswan.org
+    }
+    children {
+      host-host {
+        mode = transport
+        esp_proposals = aes256-sha512-modp4096
+      }
+    }
+  }
+}
@@ -1,22 +0,0 @@
-# /etc/ipsec.conf - strongSwan IPsec configuration file
-
-config setup
-
-conn %default
-	ikelifetime=60m
-	keylife=20m
-	rekeymargin=3m
-	keyingtries=1
-	keyexchange=ikev2
-	mobike=no
-
-conn host-host
-	left=PH_IP_DAVE
-	leftcert=daveCert.pem
-	[email protected]
-	right=PH_IP_SUN
-	rightid=sun.strongswan.org
-	ike=aes256-sha512-modp4096!
-	esp=aes256-sha512-modp4096!
-	type=transport
-	auto=add
@@ -1,5 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file

-charon {
-  load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown
+swanctl {
+  load = pem pkcs1 gmp x509 revocation random
+}
+
+charon-systemd {
+  load = aes sha1 sha2 pem pkcs1 gmp random nonce x509 curl revocation hmac xcbc vici kernel-netlink socket-default updown
 }
@@ -0,0 +1,25 @@
+connections {
+
+  host-host {
+    local_addrs  = PH_IP_DAVE
+    remote_addrs = PH_IP_SUN
+
+    proposals = aes256-sha512-modp4096
+
+    local {
+      auth = pubkey
+      certs = daveCert.pem
+      id = [email protected]
+    }
+    remote {
+      auth = pubkey
+      id = sun.strongswan.org
+    }
+    children {
+      host-host {
+        mode = transport
+        esp_proposals = aes256-sha512-modp4096
+      }
+    }
+  }
+}
@@ -11,4 +11,7 @@ charon-tkm {
      fingerprint = CA_SPK_HEX
    }
  }
+  start-scripts {
+    swanctl = /usr/local/sbin/swanctl --load-all --noprompt
+  }
 }