aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests/sql/net2net-psk
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2008-04-07 07:21:06 +0000
committerAndreas Steffen <andreas.steffen@strongswan.org>2008-04-07 07:21:06 +0000
commitdecfd8e546c29b87964c736821f900291e9c6fc2 (patch)
tree36921b45fa01456fcb6efe1a3faf88ffd16dab9e /testing/tests/sql/net2net-psk
parent480297b8830946cb66a598f49e8bfe78b4819629 (diff)
downloadstrongswan-decfd8e546c29b87964c736821f900291e9c6fc2.tar.bz2
strongswan-decfd8e546c29b87964c736821f900291e9c6fc2.tar.xz
moved strongswan.conf to /etc
Diffstat (limited to 'testing/tests/sql/net2net-psk')
-rw-r--r--testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf (renamed from testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/strongswan.conf)2
-rw-r--r--testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf (renamed from testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/strongswan.conf)2
-rw-r--r--testing/tests/sql/net2net-psk/pretest.dat4
3 files changed, 5 insertions, 3 deletions
diff --git a/testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/strongswan.conf b/testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf
index 42e7d825c..8ccb5fe20 100644
--- a/testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/strongswan.conf
+++ b/testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf
@@ -1,3 +1,5 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
charon {
plugins {
sql {
diff --git a/testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/strongswan.conf b/testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf
index 42e7d825c..8ccb5fe20 100644
--- a/testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/strongswan.conf
+++ b/testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf
@@ -1,3 +1,5 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
charon {
plugins {
sql {
diff --git a/testing/tests/sql/net2net-psk/pretest.dat b/testing/tests/sql/net2net-psk/pretest.dat
index 80c6670a4..e2dca222c 100644
--- a/testing/tests/sql/net2net-psk/pretest.dat
+++ b/testing/tests/sql/net2net-psk/pretest.dat
@@ -1,8 +1,6 @@
-moon::cp /etc/ipsec.d/strongswan.conf /usr/local/libexec/ipsec
moon::rm /etc/ipsec.d/cacerts/*
-moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
-sun::cp /etc/ipsec.d/strongswan.conf /usr/local/libexec/ipsec
sun::rm /etc/ipsec.d/cacerts/*
+moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
sun::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
moon::/etc/init.d/iptables start 2> /dev/null
sun::/etc/init.d/iptables start 2> /dev/null