moved strongswan.conf to /etc
authorAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 7 Apr 2008 07:21:06 +0000 (07:21 -0000)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 7 Apr 2008 07:21:06 +0000 (07:21 -0000)
18 files changed:
testing/do-tests.in
testing/hosts/alice/etc/strongswan.conf [new file with mode: 0644]
testing/hosts/bob/etc/strongswan.conf [new file with mode: 0644]
testing/hosts/carol/etc/strongswan.conf [new file with mode: 0644]
testing/hosts/dave/etc/strongswan.conf [new file with mode: 0644]
testing/hosts/moon/etc/strongswan.conf [new file with mode: 0644]
testing/hosts/sun/etc/strongswan.conf [new file with mode: 0644]
testing/hosts/venus/etc/strongswan.conf [new file with mode: 0644]
testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/strongswan.conf [deleted file]
testing/tests/sql/net2net-cert/hosts/moon/etc/strongswan.conf [new file with mode: 0644]
testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/strongswan.conf [deleted file]
testing/tests/sql/net2net-cert/hosts/sun/etc/strongswan.conf [new file with mode: 0644]
testing/tests/sql/net2net-cert/pretest.dat
testing/tests/sql/net2net-psk/hosts/moon/etc/ipsec.d/strongswan.conf [deleted file]
testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf [new file with mode: 0644]
testing/tests/sql/net2net-psk/hosts/sun/etc/ipsec.d/strongswan.conf [deleted file]
testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf [new file with mode: 0644]
testing/tests/sql/net2net-psk/pretest.dat

index da4a6d6..5c5c4c3 100755 (executable)
@@ -463,7 +463,7 @@ do
                    > $TESTRESULTDIR/${host}.$command 2>/dev/null
            done
 
-           for file in ipsec.conf ipsec.secrets
+           for file in strongswan.conf ipsec.conf ipsec.secrets
            do
                scp $HOSTLOGIN:/etc/$file \
                    $TESTRESULTDIR/${host}.$file  > /dev/null 2>&1
@@ -471,14 +471,12 @@ do
 
                if [ $SUBDIR = "sql" ]
                then
-                       scp $HOSTLOGIN:/etc/ipsec.d/ipsec.sql \
+                       scp $HOSTLOGIN:/etc/ipsec.sql \
                        $TESTRESULTDIR/${host}.ipsec.sql  > /dev/null 2>&1
-                       scp $HOSTLOGIN:/etc/ipsec.d/strongswan.conf \
-                       $TESTRESULTDIR/${host}.strongswan.conf > /dev/null 2>&1
                else
                        touch $TESTRESULTDIR/${host}.ipsec.sql
-                       touch $TESTRESULTDIR/${host}.strongswan.conf
                fi
+
            ssh $HOSTLOGIN ip xfrm policy \
                    > $TESTRESULTDIR/${host}.ip.policy 2>/dev/null
            ssh $HOSTLOGIN ip xfrm state \
diff --git a/testing/hosts/alice/etc/strongswan.conf b/testing/hosts/alice/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..e79fe2c
--- /dev/null
@@ -0,0 +1 @@
+# /etc/strongswan.conf - strongSwan configuration file
diff --git a/testing/hosts/bob/etc/strongswan.conf b/testing/hosts/bob/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..e79fe2c
--- /dev/null
@@ -0,0 +1 @@
+# /etc/strongswan.conf - strongSwan configuration file
diff --git a/testing/hosts/carol/etc/strongswan.conf b/testing/hosts/carol/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..e79fe2c
--- /dev/null
@@ -0,0 +1 @@
+# /etc/strongswan.conf - strongSwan configuration file
diff --git a/testing/hosts/dave/etc/strongswan.conf b/testing/hosts/dave/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..e79fe2c
--- /dev/null
@@ -0,0 +1 @@
+# /etc/strongswan.conf - strongSwan configuration file
diff --git a/testing/hosts/moon/etc/strongswan.conf b/testing/hosts/moon/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..e79fe2c
--- /dev/null
@@ -0,0 +1 @@
+# /etc/strongswan.conf - strongSwan configuration file
diff --git a/testing/hosts/sun/etc/strongswan.conf b/testing/hosts/sun/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..e79fe2c
--- /dev/null
@@ -0,0 +1 @@
+# /etc/strongswan.conf - strongSwan configuration file
diff --git a/testing/hosts/venus/etc/strongswan.conf b/testing/hosts/venus/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..e79fe2c
--- /dev/null
@@ -0,0 +1 @@
+# /etc/strongswan.conf - strongSwan configuration file
diff --git a/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/strongswan.conf b/testing/tests/sql/net2net-cert/hosts/moon/etc/ipsec.d/strongswan.conf
deleted file mode 100644 (file)
index 42e7d82..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-charon {
-  plugins {
-    sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
-    }
-  }
-}
diff --git a/testing/tests/sql/net2net-cert/hosts/moon/etc/strongswan.conf b/testing/tests/sql/net2net-cert/hosts/moon/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..8ccb5fe
--- /dev/null
@@ -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-cert/hosts/sun/etc/ipsec.d/strongswan.conf b/testing/tests/sql/net2net-cert/hosts/sun/etc/ipsec.d/strongswan.conf
deleted file mode 100644 (file)
index 42e7d82..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-charon {
-  plugins {
-    sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
-    }
-  }
-}
diff --git a/testing/tests/sql/net2net-cert/hosts/sun/etc/strongswan.conf b/testing/tests/sql/net2net-cert/hosts/sun/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..8ccb5fe
--- /dev/null
@@ -0,0 +1,9 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  plugins {
+    sql {
+      database = sqlite:///etc/ipsec.d/ipsec.db 
+    }
+  }
+}
index 80c6670..9810b0a 100644 (file)
@@ -1,7 +1,5 @@
-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/*
 sun::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
 moon::/etc/init.d/iptables start 2> /dev/null
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 (file)
index 42e7d82..0000000
+++ /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 (file)
index 0000000..8ccb5fe
--- /dev/null
@@ -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 (file)
index 42e7d82..0000000
+++ /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 (file)
index 0000000..8ccb5fe
--- /dev/null
@@ -0,0 +1,9 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  plugins {
+    sql {
+      database = sqlite:///etc/ipsec.d/ipsec.db 
+    }
+  }
+}
index 80c6670..e2dca22 100644 (file)
@@ -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