aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests/sql/net2net-psk/pretest.dat
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2017-11-11 16:42:38 +0100
committerAndreas Steffen <andreas.steffen@strongswan.org>2017-11-11 16:42:38 +0100
commit74f8ad7fd9565326045ae43949c2c0529c97b0dd (patch)
treebd1de68f38d8560f7e10d2a6bbc1b008bb3cc18e /testing/tests/sql/net2net-psk/pretest.dat
parent0d632555130e4f8665c6aeb4de90d0428509a4b8 (diff)
parent7df35af7ccc9a7cac683dd7a41313d419b784d78 (diff)
downloadstrongswan-74f8ad7fd9565326045ae43949c2c0529c97b0dd.tar.bz2
strongswan-74f8ad7fd9565326045ae43949c2c0529c97b0dd.tar.xz
Merge branch 'swanctl-testing'
Diffstat (limited to 'testing/tests/sql/net2net-psk/pretest.dat')
-rw-r--r--testing/tests/sql/net2net-psk/pretest.dat8
1 files changed, 5 insertions, 3 deletions
diff --git a/testing/tests/sql/net2net-psk/pretest.dat b/testing/tests/sql/net2net-psk/pretest.dat
index 6580e7604..dd91c3859 100644
--- a/testing/tests/sql/net2net-psk/pretest.dat
+++ b/testing/tests/sql/net2net-psk/pretest.dat
@@ -2,10 +2,12 @@ moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ips
sun::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/db.d/ipsec.sql
moon::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
sun::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
+moon::cd /etc/swanctl; rm -r rsa/* x509/* x509ca/*
+sun::cd /etc/swanctl; rm -r rsa/* x509/* x509ca/*
moon::iptables-restore < /etc/iptables.rules
sun::iptables-restore < /etc/iptables.rules
-moon::service charon start 2> /dev/null
-sun::service charon start 2> /dev/null
-moon::expect-connection net-net
+moon::systemctl start strongswan-swanctl
+sun::systemctl start strongswan-swanctl
+moon::expect-connection net-net
sun::expect-connection net-net
moon::swanctl --initiate --child net-net 2> /dev/null