testing: Use include statement in swanctl/rw-pubkey-keyid scenario

diff --git a/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/swanctl/swanctl.conf
index b2bba5f88627ac0a815cb90fe96eb65b5451fef0..eac4bc1aa7f5f8fe6f3f4d79ad7356023ca42e6b 100755 (executable)
--- a/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/swanctl/swanctl.conf
+++ b/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/swanctl/swanctl.conf
@@ -1,48 +1,20 @@
 connections {
 
    rw-carol {
-      local_addrs  = 192.168.0.1
+      include swanctl_base.conf
 
-      local {
-         auth = pubkey
-         pubkeys = moonPub.pem
-      }
       remote {
          auth = pubkey
          pubkeys = carolPub.pem
       }
-      children {
-         net {
-            local_ts  = 10.1.0.0/16 
-
-            updown = /usr/local/libexec/ipsec/_updown iptables
-            esp_proposals = aes128gcm128-ecp256
-         }
-      }
-      version = 2
-      proposals = aes128-sha256-ecp256
    }
 
    rw-dave {
-      local_addrs  = 192.168.0.1
+      include swanctl_base.conf
 
-      local {
-         auth = pubkey
-         pubkeys = moonPub.pem
-      }
       remote {
          auth = pubkey
          pubkeys = davePub.pem
       }
-      children {
-         net {
-            local_ts  = 10.1.0.0/16
-
-            updown = /usr/local/libexec/ipsec/_updown iptables
-            esp_proposals = aes128gcm128-ecp256
-         }
-      }
-      version = 2
-      proposals = aes128-sha256-ecp256
    }
 }

diff --git a/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/swanctl/swanctl_base.conf b/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/swanctl/swanctl_base.conf
new file mode 100755 (executable)
index 0000000..61e71f8
--- /dev/null
+++ b/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/swanctl/swanctl_base.conf
@@ -0,0 +1,16 @@
+      local_addrs  = 192.168.0.1
+
+      local {
+         auth = pubkey
+         pubkeys = moonPub.pem
+      }
+      children {
+         net {
+            local_ts  = 10.1.0.0/16 
+
+            updown = /usr/local/libexec/ipsec/_updown iptables
+            esp_proposals = aes128gcm128-ecp256
+         }
+      }
+      version = 2
+      proposals = aes128-sha256-ecp256

diff --git a/testing/tests/swanctl/rw-pubkey-keyid/pretest.dat b/testing/tests/swanctl/rw-pubkey-keyid/pretest.dat
index 4d9dccf1275500ca25bc7919d020d416556ce48c..de43d510dac8e0cb50b9effae420bbd52961301d 100755 (executable)
--- a/testing/tests/swanctl/rw-pubkey-keyid/pretest.dat
+++ b/testing/tests/swanctl/rw-pubkey-keyid/pretest.dat
@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::cd /etc/swanctl; rm x509/* x509ca/*
 carol::cd /etc/swanctl; rm x509/* x509ca/*
 dave::cd /etc/swanctl; rm x509/* x509ca/*
+moon::cat /etc/swanctl/swanctl_base.conf
 moon::service charon start 2> /dev/null
 carol::service charon start 2> /dev/null
 dave::service charon start 2> /dev/null