diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2016-01-14 01:44:17 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2016-01-14 01:44:17 +0100 |
| commit | e7b5171e430a1b60936d487dbb9483dda2a2cc1a (patch) | |
| tree | 3647ef2344ad9dc6e69cfccd3ab1748295b13d28 | |
| parent | 9492e12e614c3f526d534c2c4199e93b700bea2a (diff) | |
| download | strongswan-e7b5171e430a1b60936d487dbb9483dda2a2cc1a.tar.bz2 strongswan-e7b5171e430a1b60936d487dbb9483dda2a2cc1a.tar.xz | |
testing: Use include statement in swanctl/rw-pubkey-keyid scenario
3 files changed, 19 insertions, 30 deletions
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 b2bba5f88..eac4bc1aa 100755 --- 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 index 000000000..61e71f873 --- /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 4d9dccf12..de43d510d 100755 --- 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 |