From decfd8e546c29b87964c736821f900291e9c6fc2 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 7 Apr 2008 07:21:06 +0000
Subject: moved strongswan.conf to /etc

---
 .../tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/strongswan.conf | 7 -------
 testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf     | 9 +++++++++
 .../tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/strongswan.conf  | 7 -------
 testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf      | 9 +++++++++
 testing/tests/sql/net2net-psk/pretest.dat                        | 4 +---
 5 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/strongswan.conf
 create mode 100644 testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf
 delete mode 100644 testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/strongswan.conf
 create mode 100644 testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf

(limited to 'testing/tests/sql/net2net-psk')

diff --git a/testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/strongswan.conf b/testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/strongswan.conf
deleted file mode 100644
index 42e7d825c..000000000
--- a/testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/strongswan.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-charon {
-  plugins {
-    sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
-    }
-  }
-}
diff --git a/testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf b/testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf
new file mode 100644
index 000000000..8ccb5fe20
--- /dev/null
+++ b/testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf
@@ -0,0 +1,9 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  plugins {
+    sql {
+      database = sqlite:///etc/ipsec.d/ipsec.db 
+    }
+  }
+}
diff --git a/testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/strongswan.conf b/testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/strongswan.conf
deleted file mode 100644
index 42e7d825c..000000000
--- a/testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/strongswan.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-charon {
-  plugins {
-    sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
-    }
-  }
-}
diff --git a/testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf b/testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf
new file mode 100644
index 000000000..8ccb5fe20
--- /dev/null
+++ b/testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf
@@ -0,0 +1,9 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  plugins {
+    sql {
+      database = sqlite:///etc/ipsec.d/ipsec.db 
+    }
+  }
+}
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
-- 
cgit v1.2.3