summaryrefslogtreecommitdiff
path: root/testing/tests/sql/rw-rsa/pretest.dat
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2015-11-18 15:19:06 +0100
committerYves-Alexis Perez <corsac@debian.org>2015-11-18 15:19:06 +0100
commitfb6324eb165d1577bc4541bc2fc6758c56da2a95 (patch)
treeafbc98168e056e7839ac0dc434db8f88ffb34833 /testing/tests/sql/rw-rsa/pretest.dat
parentea6a577e967da0ee954b06b7bdc6796e97eb9b2b (diff)
parent1e980d6be0ef0e243c6fe82b5e855454b97e24a4 (diff)
downloadvyos-strongswan-fb6324eb165d1577bc4541bc2fc6758c56da2a95.tar.gz
vyos-strongswan-fb6324eb165d1577bc4541bc2fc6758c56da2a95.zip
Merge tag 'upstream/5.3.4'
Upstream version 5.3.4
Diffstat (limited to 'testing/tests/sql/rw-rsa/pretest.dat')
-rw-r--r--testing/tests/sql/rw-rsa/pretest.dat15
1 files changed, 8 insertions, 7 deletions
diff --git a/testing/tests/sql/rw-rsa/pretest.dat b/testing/tests/sql/rw-rsa/pretest.dat
index 6d56ede09..0cea9d816 100644
--- a/testing/tests/sql/rw-rsa/pretest.dat
+++ b/testing/tests/sql/rw-rsa/pretest.dat
@@ -1,18 +1,19 @@
moon::rm /etc/ipsec.d/cacerts/*
carol::rm /etc/ipsec.d/cacerts/*
dave::rm /etc/ipsec.d/cacerts/*
-moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/ipsec.d/ipsec.sql
-carol::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/ipsec.d/ipsec.sql
-dave::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/ipsec.d/ipsec.sql
-moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
-carol::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
-dave::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
+moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/db.d/ipsec.sql
+carol::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/db.d/ipsec.sql
+dave::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
+carol::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
+dave::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
moon::iptables-restore < /etc/iptables.rules
carol::iptables-restore < /etc/iptables.rules
dave::iptables-restore < /etc/iptables.rules
moon::ipsec start
carol::ipsec start
dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
carol::ipsec up home
+dave::expect-connection home
dave::ipsec up home