]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
testing: Reduce runtime of all tests that use SQLite databases by storing them in...
authorTobias Brunner <tobias@strongswan.org>
Fri, 6 Nov 2015 16:27:45 +0000 (17:27 +0100)
committerTobias Brunner <tobias@strongswan.org>
Mon, 9 Nov 2015 14:18:39 +0000 (15:18 +0100)
161 files changed:
testing/tests/ikev1/ip-pool-db/hosts/moon/etc/strongswan.conf
testing/tests/ikev1/ip-pool-db/posttest.dat
testing/tests/ikev1/ip-pool-db/pretest.dat
testing/tests/ikev1/ip-pool-db/test.conf
testing/tests/ikev2/ip-pool-db/hosts/moon/etc/strongswan.conf
testing/tests/ikev2/ip-pool-db/posttest.dat
testing/tests/ikev2/ip-pool-db/pretest.dat
testing/tests/ikev2/ip-pool-db/test.conf
testing/tests/ikev2/ip-split-pools-db/hosts/moon/etc/strongswan.conf
testing/tests/ikev2/ip-split-pools-db/posttest.dat
testing/tests/ikev2/ip-split-pools-db/pretest.dat
testing/tests/ikev2/ip-split-pools-db/test.conf
testing/tests/ikev2/ip-two-pools-db/hosts/moon/etc/strongswan.conf
testing/tests/ikev2/ip-two-pools-db/posttest.dat
testing/tests/ikev2/ip-two-pools-db/pretest.dat
testing/tests/ikev2/ip-two-pools-db/test.conf
testing/tests/ikev2/ip-two-pools-mixed/hosts/moon/etc/strongswan.conf
testing/tests/ikev2/ip-two-pools-mixed/posttest.dat
testing/tests/ikev2/ip-two-pools-mixed/pretest.dat
testing/tests/ikev2/ip-two-pools-mixed/test.conf
testing/tests/ikev2/ip-two-pools-v4v6-db/hosts/moon/etc/strongswan.conf
testing/tests/ikev2/ip-two-pools-v4v6-db/posttest.dat
testing/tests/ikev2/ip-two-pools-v4v6-db/pretest.dat
testing/tests/ikev2/ip-two-pools-v4v6-db/test.conf
testing/tests/ikev2/ip-two-pools/posttest.dat
testing/tests/sql/ip-pool-db-expired/hosts/carol/etc/strongswan.conf
testing/tests/sql/ip-pool-db-expired/hosts/dave/etc/strongswan.conf
testing/tests/sql/ip-pool-db-expired/hosts/moon/etc/strongswan.conf
testing/tests/sql/ip-pool-db-expired/posttest.dat
testing/tests/sql/ip-pool-db-expired/pretest.dat
testing/tests/sql/ip-pool-db-expired/test.conf
testing/tests/sql/ip-pool-db-restart/hosts/carol/etc/strongswan.conf
testing/tests/sql/ip-pool-db-restart/hosts/dave/etc/strongswan.conf
testing/tests/sql/ip-pool-db-restart/hosts/moon/etc/strongswan.conf
testing/tests/sql/ip-pool-db-restart/posttest.dat
testing/tests/sql/ip-pool-db-restart/pretest.dat
testing/tests/sql/ip-pool-db-restart/test.conf
testing/tests/sql/ip-pool-db/hosts/carol/etc/strongswan.conf
testing/tests/sql/ip-pool-db/hosts/dave/etc/strongswan.conf
testing/tests/sql/ip-pool-db/hosts/moon/etc/strongswan.conf
testing/tests/sql/ip-pool-db/posttest.dat
testing/tests/sql/ip-pool-db/pretest.dat
testing/tests/sql/ip-pool-db/test.conf
testing/tests/sql/ip-split-pools-db-restart/hosts/carol/etc/strongswan.conf
testing/tests/sql/ip-split-pools-db-restart/hosts/dave/etc/strongswan.conf
testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/strongswan.conf
testing/tests/sql/ip-split-pools-db-restart/posttest.dat
testing/tests/sql/ip-split-pools-db-restart/pretest.dat
testing/tests/sql/ip-split-pools-db-restart/test.conf
testing/tests/sql/ip-split-pools-db/hosts/carol/etc/strongswan.conf
testing/tests/sql/ip-split-pools-db/hosts/dave/etc/strongswan.conf
testing/tests/sql/ip-split-pools-db/hosts/moon/etc/strongswan.conf
testing/tests/sql/ip-split-pools-db/posttest.dat
testing/tests/sql/ip-split-pools-db/pretest.dat
testing/tests/sql/ip-split-pools-db/test.conf
testing/tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf
testing/tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf
testing/tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf
testing/tests/sql/multi-level-ca/posttest.dat
testing/tests/sql/multi-level-ca/pretest.dat
testing/tests/sql/multi-level-ca/test.conf
testing/tests/sql/net2net-cert/hosts/moon/etc/strongswan.conf
testing/tests/sql/net2net-cert/hosts/sun/etc/strongswan.conf
testing/tests/sql/net2net-cert/posttest.dat
testing/tests/sql/net2net-cert/pretest.dat
testing/tests/sql/net2net-cert/test.conf
testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf
testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf
testing/tests/sql/net2net-psk/posttest.dat
testing/tests/sql/net2net-psk/pretest.dat
testing/tests/sql/net2net-psk/test.conf
testing/tests/sql/net2net-route-pem/hosts/moon/etc/strongswan.conf
testing/tests/sql/net2net-route-pem/hosts/sun/etc/strongswan.conf
testing/tests/sql/net2net-route-pem/posttest.dat
testing/tests/sql/net2net-route-pem/pretest.dat
testing/tests/sql/net2net-route-pem/test.conf
testing/tests/sql/net2net-start-pem/hosts/moon/etc/strongswan.conf
testing/tests/sql/net2net-start-pem/hosts/sun/etc/strongswan.conf
testing/tests/sql/net2net-start-pem/posttest.dat
testing/tests/sql/net2net-start-pem/pretest.dat
testing/tests/sql/net2net-start-pem/test.conf
testing/tests/sql/rw-cert/hosts/carol/etc/strongswan.conf
testing/tests/sql/rw-cert/hosts/dave/etc/strongswan.conf
testing/tests/sql/rw-cert/hosts/moon/etc/strongswan.conf
testing/tests/sql/rw-cert/posttest.dat
testing/tests/sql/rw-cert/pretest.dat
testing/tests/sql/rw-cert/test.conf
testing/tests/sql/rw-eap-aka-rsa/hosts/carol/etc/strongswan.conf
testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/strongswan.conf
testing/tests/sql/rw-eap-aka-rsa/posttest.dat
testing/tests/sql/rw-eap-aka-rsa/pretest.dat
testing/tests/sql/rw-eap-aka-rsa/test.conf
testing/tests/sql/rw-psk-ipv4/hosts/carol/etc/strongswan.conf
testing/tests/sql/rw-psk-ipv4/hosts/dave/etc/strongswan.conf
testing/tests/sql/rw-psk-ipv4/hosts/moon/etc/strongswan.conf
testing/tests/sql/rw-psk-ipv4/posttest.dat
testing/tests/sql/rw-psk-ipv4/pretest.dat
testing/tests/sql/rw-psk-ipv4/test.conf
testing/tests/sql/rw-psk-ipv6/hosts/carol/etc/strongswan.conf
testing/tests/sql/rw-psk-ipv6/hosts/dave/etc/strongswan.conf
testing/tests/sql/rw-psk-ipv6/hosts/moon/etc/strongswan.conf
testing/tests/sql/rw-psk-ipv6/posttest.dat
testing/tests/sql/rw-psk-ipv6/pretest.dat
testing/tests/sql/rw-psk-ipv6/test.conf
testing/tests/sql/rw-psk-rsa-split/hosts/carol/etc/strongswan.conf
testing/tests/sql/rw-psk-rsa-split/hosts/dave/etc/strongswan.conf
testing/tests/sql/rw-psk-rsa-split/hosts/moon/etc/strongswan.conf
testing/tests/sql/rw-psk-rsa-split/posttest.dat
testing/tests/sql/rw-psk-rsa-split/pretest.dat
testing/tests/sql/rw-psk-rsa-split/test.conf
testing/tests/sql/rw-rsa-keyid/hosts/carol/etc/strongswan.conf
testing/tests/sql/rw-rsa-keyid/hosts/dave/etc/strongswan.conf
testing/tests/sql/rw-rsa-keyid/hosts/moon/etc/strongswan.conf
testing/tests/sql/rw-rsa-keyid/posttest.dat
testing/tests/sql/rw-rsa-keyid/pretest.dat
testing/tests/sql/rw-rsa-keyid/test.conf
testing/tests/sql/rw-rsa/hosts/carol/etc/strongswan.conf
testing/tests/sql/rw-rsa/hosts/dave/etc/strongswan.conf
testing/tests/sql/rw-rsa/hosts/moon/etc/strongswan.conf
testing/tests/sql/rw-rsa/posttest.dat
testing/tests/sql/rw-rsa/pretest.dat
testing/tests/sql/rw-rsa/test.conf
testing/tests/sql/shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf
testing/tests/sql/shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf
testing/tests/sql/shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf
testing/tests/sql/shunt-policies-nat-rw/posttest.dat
testing/tests/sql/shunt-policies-nat-rw/pretest.dat
testing/tests/sql/shunt-policies-nat-rw/test.conf
testing/tests/swanctl/ip-pool-db/hosts/moon/etc/strongswan.conf
testing/tests/swanctl/ip-pool-db/pretest.dat
testing/tests/swanctl/ip-pool-db/test.conf
testing/tests/tnc/tnccs-11-radius-pts/hosts/alice/etc/strongswan.conf
testing/tests/tnc/tnccs-11-radius-pts/posttest.dat
testing/tests/tnc/tnccs-11-radius-pts/pretest.dat
testing/tests/tnc/tnccs-11-radius-pts/test.conf
testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf
testing/tests/tnc/tnccs-20-os-pts/posttest.dat
testing/tests/tnc/tnccs-20-os-pts/pretest.dat
testing/tests/tnc/tnccs-20-os-pts/test.conf
testing/tests/tnc/tnccs-20-os/hosts/moon/etc/strongswan.conf
testing/tests/tnc/tnccs-20-os/posttest.dat
testing/tests/tnc/tnccs-20-os/pretest.dat
testing/tests/tnc/tnccs-20-os/test.conf
testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongTNC/settings.ini
testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongswan.conf
testing/tests/tnc/tnccs-20-pdp-eap/posttest.dat
testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat
testing/tests/tnc/tnccs-20-pdp-eap/test.conf
testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongTNC/settings.ini
testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongswan.conf
testing/tests/tnc/tnccs-20-pdp-pt-tls/posttest.dat
testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat
testing/tests/tnc/tnccs-20-pdp-pt-tls/test.conf
testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/strongswan.conf
testing/tests/tnc/tnccs-20-pts-no-ecc/posttest.dat
testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat
testing/tests/tnc/tnccs-20-pts-no-ecc/test.conf
testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/strongswan.conf
testing/tests/tnc/tnccs-20-pts/posttest.dat
testing/tests/tnc/tnccs-20-pts/pretest.dat
testing/tests/tnc/tnccs-20-pts/test.conf

index a4542db770cb209f109cd6d5d59d31052744d540..6c22fd548aa960641349581708038fdfb03075ef 100644 (file)
@@ -7,7 +7,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index c99f347e32dad40415a264dfd0b77480c04051ea..37436a3d9f750e52f50fee3d4ed583fb647e3715 100644 (file)
@@ -7,4 +7,3 @@ dave::iptables-restore < /etc/iptables.flush
 moon::ipsec pool --del bigpool 2> /dev/null
 moon::ipsec pool --del dns 2> /dev/null
 moon::ipsec pool --del nbns 2> /dev/null
-moon::rm /etc/ipsec.d/ipsec.*
index 0e3175abc7aeffd8980621dba64d6392cd94baa8..337ccb297b6547b1612fa3fc7c2f97d109600edd 100644 (file)
@@ -1,5 +1,5 @@
-moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/ipsec.d/ipsec.sql
-moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
+moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/db.d/ipsec.sql
+moon::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
 moon::ipsec pool --add bigpool --start 10.3.0.1 --end 10.3.3.232 --timeout 0 2> /dev/null
 moon::ipsec pool --addattr dns  --server PH_IP_WINNETOU 2> /dev/null
 moon::ipsec pool --addattr dns  --server PH_IP_VENUS 2> /dev/null
index 164b07ff9761f484661799c906b1a3792c30b9a5..31820ea1a685dca9d0f3c9307aad6a4f12f144fb 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon alice"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="moon"
index a4542db770cb209f109cd6d5d59d31052744d540..6c22fd548aa960641349581708038fdfb03075ef 100644 (file)
@@ -7,7 +7,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index c99f347e32dad40415a264dfd0b77480c04051ea..37436a3d9f750e52f50fee3d4ed583fb647e3715 100644 (file)
@@ -7,4 +7,3 @@ dave::iptables-restore < /etc/iptables.flush
 moon::ipsec pool --del bigpool 2> /dev/null
 moon::ipsec pool --del dns 2> /dev/null
 moon::ipsec pool --del nbns 2> /dev/null
-moon::rm /etc/ipsec.d/ipsec.*
index 0e3175abc7aeffd8980621dba64d6392cd94baa8..337ccb297b6547b1612fa3fc7c2f97d109600edd 100644 (file)
@@ -1,5 +1,5 @@
-moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/ipsec.d/ipsec.sql
-moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
+moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/db.d/ipsec.sql
+moon::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
 moon::ipsec pool --add bigpool --start 10.3.0.1 --end 10.3.3.232 --timeout 0 2> /dev/null
 moon::ipsec pool --addattr dns  --server PH_IP_WINNETOU 2> /dev/null
 moon::ipsec pool --addattr dns  --server PH_IP_VENUS 2> /dev/null
index 164b07ff9761f484661799c906b1a3792c30b9a5..31820ea1a685dca9d0f3c9307aad6a4f12f144fb 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon alice"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="moon"
index a4542db770cb209f109cd6d5d59d31052744d540..6c22fd548aa960641349581708038fdfb03075ef 100644 (file)
@@ -7,7 +7,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index 9d88281ad7aa91dbad91f8befca413fb5c652090..6066d464ad902128acdb9dbb4389e203e2c5499c 100644 (file)
@@ -3,4 +3,3 @@ dave::ipsec stop
 moon::ipsec stop
 moon::ipsec pool --del pool0 2> /dev/null
 moon::ipsec pool --del pool1 2> /dev/null
-moon::rm /etc/ipsec.d/ipsec.*
index 77a79cf8ce86cc3fa9382d3e5aa88bbcfa7c5380..f745763823400454cdfbf838fee86d56bbf67cfc 100644 (file)
@@ -1,5 +1,5 @@
-moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/ipsec.d/ipsec.sql
-moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
+moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/db.d/ipsec.sql
+moon::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
 moon::ipsec pool --add pool0 --start 10.3.0.1 --end 10.3.0.1 --timeout 48 2> /dev/null
 moon::ipsec pool --add pool1 --start 10.3.1.1 --end 10.3.1.1 --timeout 48 2> /dev/null
 moon::ipsec pool --status 2> /dev/null
index 164b07ff9761f484661799c906b1a3792c30b9a5..31820ea1a685dca9d0f3c9307aad6a4f12f144fb 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon alice"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="moon"
index fe6cdde42794ac7682b0317bc66d0670cc029445..cf3b0d81bda1fc8a32208902f617101821d00e2a 100644 (file)
@@ -7,7 +7,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index 150690e3cbaccc742a0ecb642ac5182cba2ccad7..dd4abebadf5b39be958c578db77df2437d90b594 100644 (file)
@@ -15,4 +15,3 @@ moon::ipsec pool --del intpool 2> /dev/null
 moon::ipsec pool --delattr dns --server PH_IP_VENUS --pool intpool --identity venus.strongswan.org 2> /dev/null
 moon::ipsec pool --delattr dns --server PH_IP_ALICE --pool intpool --identity alice@strongswan.org 2> /dev/null
 moon::ipsec pool --delattr dns --server PH_IP_WINNETOU --pool extpool 2> /dev/null
-moon::rm /etc/ipsec.d/ipsec.*
index 3dfd974efce418344f0bb964ed9bb694e0224f47..e9542d3a39e5d34bd74c91a7969846f6cb83d501 100644 (file)
@@ -1,5 +1,5 @@
-moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/ipsec.d/ipsec.sql
-moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
+moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/db.d/ipsec.sql
+moon::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
 moon::ipsec pool --add extpool --start 10.3.0.1 --end 10.3.1.244 --timeout 48 2> /dev/null
 moon::ipsec pool --add intpool --start 10.4.0.1 --end 10.4.1.244 --timeout  0 2> /dev/null
 moon::ipsec pool --addattr dns --server PH_IP_VENUS --pool intpool --identity venus.strongswan.org 2> /dev/null
index c88e11d2810a62ace770471b3469c76745b5f063..167c75d9dcea8c09729de03106d5207b85b92aaf 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="alice venus carol dave"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="alice venus moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="moon"
index fe6cdde42794ac7682b0317bc66d0670cc029445..cf3b0d81bda1fc8a32208902f617101821d00e2a 100644 (file)
@@ -7,7 +7,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index 57449be256fc06893cf0a1668c649728ceba74b1..0c3cd2648c476cd59c0487409e838087ef4978ea 100644 (file)
@@ -5,4 +5,3 @@ moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 alice::iptables-restore < /etc/iptables.flush
 moon::ipsec pool --del intpool 2> /dev/null
-moon::rm /etc/ipsec.d/ipsec.*
index c77347632eae629ceefb716756b37520611538f0..5b32741316d8eb1df3660490a934d70bb48749d1 100644 (file)
@@ -1,5 +1,5 @@
-moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/ipsec.d/ipsec.sql
-moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
+moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/db.d/ipsec.sql
+moon::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
 moon::ipsec pool --add intpool --start 10.4.0.1 --end 10.4.1.244 --timeout  0 2> /dev/null
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
index 1ed3473ab0fba3be6aa42eece8e659e1cb37db75..0c1b38d49178f4106a041485ddbe86c7c820ede2 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="alice carol"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="alice moon carol"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="moon"
index c7e9a44c1d775aeb3f5d122a7f2d29a28224fe61..5176e2a4dd79a585516532bf9aad51a0a8f303c7 100644 (file)
@@ -7,7 +7,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index 2e78893e3102fb94499329e08e004d541baad858..e46195cd36f15977aef1b9b321b3ac1f2e7b31e4 100644 (file)
@@ -1,4 +1,3 @@
 alice::ip -6 route del default via fec1:\:1
 carol::ipsec stop
 moon::ipsec stop
-moon::rm /etc/ipsec.d/ipsec.*
index 2fbf410133c35e0d1b74018ffad95073eeda6ca8..60af3bce9fd46bc44b192ac5e9b56845209c4c97 100644 (file)
@@ -1,5 +1,5 @@
-moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/ipsec.d/ipsec.sql
-moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
+moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/db.d/ipsec.sql
+moon::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
 moon::ipsec pool --add v4_pool --start 10.3.0.1 --end 10.3.1.244 --timeout 48 2> /dev/null
 moon::ipsec pool --add v6_pool --start fec3:\:1 --end fec3:\:fe --timeout  48 2> /dev/null
 alice::ip -6 route add default via fec1:\:1
index cd03759f06e11afdf9a8eeea84506f5ee73e55d8..60819189ca30688716a3368cdb4c3ba98cc714c8 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="carol"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="moon"
index 7de2bc9be1f2b3643f915ea37a9e2b8ef93ca2ae..e4b04369601224f19551245488cecd4b2d968034 100644 (file)
@@ -4,4 +4,3 @@ moon::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 alice::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 3b720bff2a70811fef6bae6319f6dd5dcad6c022..64e7cc7225e6b74628d55b7b7b088da36a6a7ac6 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql attr-sql
@@ -12,7 +12,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index 1b963fcec289ada6ac4e93d532b4cd623a7efce5..b757d8b152c68ffa2cdf7d2ca90c3d8582f4d76f 100644 (file)
@@ -4,7 +4,3 @@ moon::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-dave::rm /etc/ipsec.d/ipsec.*
-~
index b0776d4a4a4c0090aa0ecd212dd75f896081c722..3e1b762d7df7e9fb1270686b3b7c8076f0700fd5 100644 (file)
@@ -1,12 +1,12 @@
 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::ipsec pool --leases 2> /dev/null
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
index 9b1ec0b545fc89b821130219ae62f27c1fc74274..450100fbeb45c19cf179a647d165d92bde9816cc 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="alice moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 3b720bff2a70811fef6bae6319f6dd5dcad6c022..64e7cc7225e6b74628d55b7b7b088da36a6a7ac6 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql attr-sql
@@ -12,7 +12,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index 1b963fcec289ada6ac4e93d532b4cd623a7efce5..b757d8b152c68ffa2cdf7d2ca90c3d8582f4d76f 100644 (file)
@@ -4,7 +4,3 @@ moon::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-dave::rm /etc/ipsec.d/ipsec.*
-~
index 7c8898613e5d9ab64a61a451bf73b053aabbf118..4976693ecdbd8329c0c9bd399b988091493a72dd 100644 (file)
@@ -1,12 +1,12 @@
 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::ipsec pool --leases 2> /dev/null
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
index 9b1ec0b545fc89b821130219ae62f27c1fc74274..450100fbeb45c19cf179a647d165d92bde9816cc 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="alice moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 62d9edbd854d4c276ab6ab0f0f864bbe3729b3a8..4346eca404650eebaf05049935fa686e7e0cc891 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql resolve
index 62d9edbd854d4c276ab6ab0f0f864bbe3729b3a8..4346eca404650eebaf05049935fa686e7e0cc891 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql resolve
index 3b720bff2a70811fef6bae6319f6dd5dcad6c022..64e7cc7225e6b74628d55b7b7b088da36a6a7ac6 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql attr-sql
@@ -12,7 +12,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index 1b963fcec289ada6ac4e93d532b4cd623a7efce5..47061432a7ac0f90b8bf068e3fe3f660e688018d 100644 (file)
@@ -4,7 +4,6 @@ moon::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-dave::rm /etc/ipsec.d/ipsec.*
-~
+moon::dbdir-remove
+carol::dbdir-remove
+dave::dbdir-remove
index f0d045cb805bbfa180338b855600139af00e0bf2..0cea9d816ed461e77f6a01bffbc5fb27faf45358 100644 (file)
@@ -1,12 +1,12 @@
 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
index 9b1ec0b545fc89b821130219ae62f27c1fc74274..450100fbeb45c19cf179a647d165d92bde9816cc 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="alice moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 3b720bff2a70811fef6bae6319f6dd5dcad6c022..64e7cc7225e6b74628d55b7b7b088da36a6a7ac6 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql attr-sql
@@ -12,7 +12,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index 0fce500bf8abbb9c774a06615c21863e70e372a5..a851d09240725fcef416d07b43611a0ecadfd7eb 100644 (file)
@@ -1,7 +1,3 @@
 carol::ipsec stop
 dave::ipsec stop
 moon::ipsec stop
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-dave::rm /etc/ipsec.d/ipsec.*
-~
index 0805232ac02b82b4f410ee601816f24636e865f5..706cb3205429bb0816c1ba9b37eb84cc25a693b9 100644 (file)
@@ -1,12 +1,12 @@
 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::ipsec pool --status 2> /dev/null
 moon::ipsec pool --leases 2> /dev/null
 moon::ipsec start
index 9b1ec0b545fc89b821130219ae62f27c1fc74274..450100fbeb45c19cf179a647d165d92bde9816cc 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="alice moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 3b720bff2a70811fef6bae6319f6dd5dcad6c022..64e7cc7225e6b74628d55b7b7b088da36a6a7ac6 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql attr-sql
@@ -12,7 +12,7 @@ charon {
 libhydra {
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index 0fce500bf8abbb9c774a06615c21863e70e372a5..a851d09240725fcef416d07b43611a0ecadfd7eb 100644 (file)
@@ -1,7 +1,3 @@
 carol::ipsec stop
 dave::ipsec stop
 moon::ipsec stop
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-dave::rm /etc/ipsec.d/ipsec.*
-~
index 5a4a135223e53d1663de43e9965120b286c2f177..e820c81a2d0248bae200a2916427e88ff82534ce 100644 (file)
@@ -1,12 +1,12 @@
 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::ipsec pool --status 2> /dev/null
 moon::ipsec start
 carol::ipsec start
index 9b1ec0b545fc89b821130219ae62f27c1fc74274..450100fbeb45c19cf179a647d165d92bde9816cc 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="alice moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index e9ad4bea60c33c249e0ddf0faec36603d1ccb5f6..1865a1c60eb1dcb5867d6c1d9bf6605f054c4757 100644 (file)
@@ -4,7 +4,3 @@ dave::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-dave::rm /etc/ipsec.d/ipsec.*
-~
index f0d045cb805bbfa180338b855600139af00e0bf2..0cea9d816ed461e77f6a01bffbc5fb27faf45358 100644 (file)
@@ -1,12 +1,12 @@
 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
index f292988506cd9f32494f96885953dd6645e93f3c..f6fb44f5f95f145647e8bc46344ce349970e8eac 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 329a572b2ae957460c3a89dd0c8db50ab78dd5b1..1f7aa73a15246c938c27f4e67da2edcfc068f43e 100644 (file)
@@ -2,5 +2,3 @@ moon::ipsec stop
 sun::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 sun::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-sun::rm /etc/ipsec.d/ipsec.*
index 95d4c7b20a5325a0bbaf3311a2b7971f802e1300..05fe277ceca6f57077994e99367e30786c311355 100644 (file)
@@ -1,9 +1,9 @@
 moon::rm /etc/ipsec.d/cacerts/*
 sun::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
-sun::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
-sun::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
+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::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
index 646b8b3e64f73ecc2d9b6a67ccf77ff252dd37d7..1b7e280e88e52eaab70bfb4ea3d41b65d263841c 100644 (file)
@@ -10,7 +10,7 @@ VIRTHOSTS="alice moon winnetou sun bob"
 # Corresponding block diagram
 #
 DIAGRAM="a-m-w-s-b.png"
+
 # Guest instances on which tcpdump is to be started
 #
 TCPDUMPHOSTS="sun"
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="sun"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon sun"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 5e4eb1246c43cf673679449c4e127d6aa834f7c8..e20fecca58ed6b3d627b1f35036f1cbc3c1db39e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce hmac stroke kernel-netlink socket-default updown sqlite sql
index 5e4eb1246c43cf673679449c4e127d6aa834f7c8..e20fecca58ed6b3d627b1f35036f1cbc3c1db39e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce hmac stroke kernel-netlink socket-default updown sqlite sql
index 329a572b2ae957460c3a89dd0c8db50ab78dd5b1..1f7aa73a15246c938c27f4e67da2edcfc068f43e 100644 (file)
@@ -2,5 +2,3 @@ moon::ipsec stop
 sun::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 sun::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-sun::rm /etc/ipsec.d/ipsec.*
index 95d4c7b20a5325a0bbaf3311a2b7971f802e1300..05fe277ceca6f57077994e99367e30786c311355 100644 (file)
@@ -1,9 +1,9 @@
 moon::rm /etc/ipsec.d/cacerts/*
 sun::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
-sun::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
-sun::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
+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::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
index 646b8b3e64f73ecc2d9b6a67ccf77ff252dd37d7..1b7e280e88e52eaab70bfb4ea3d41b65d263841c 100644 (file)
@@ -10,7 +10,7 @@ VIRTHOSTS="alice moon winnetou sun bob"
 # Corresponding block diagram
 #
 DIAGRAM="a-m-w-s-b.png"
+
 # Guest instances on which tcpdump is to be started
 #
 TCPDUMPHOSTS="sun"
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="sun"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon sun"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 329a572b2ae957460c3a89dd0c8db50ab78dd5b1..1f7aa73a15246c938c27f4e67da2edcfc068f43e 100644 (file)
@@ -2,5 +2,3 @@ moon::ipsec stop
 sun::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 sun::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-sun::rm /etc/ipsec.d/ipsec.*
index 93c3cfd12ddeaaccb46c60a0bbe5c595a1a915f2..cef74e4744e0275b14e8a5ef6211d0d59952c9be 100644 (file)
@@ -1,9 +1,9 @@
 moon::rm /etc/ipsec.d/cacerts/*
 sun::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
-sun::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
-sun::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
+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::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 sun::ipsec start
index 10c582c9b97d964b6a538327ea98cf14003e77b3..ee97968ab1079d584eec985b4248258777c427b9 100644 (file)
@@ -10,7 +10,7 @@ VIRTHOSTS="alice venus moon winnetou sun bob"
 # Corresponding block diagram
 #
 DIAGRAM="a-v-m-w-s-b.png"
+
 # Guest instances on which tcpdump is to be started
 #
 TCPDUMPHOSTS="sun"
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="sun"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon sun"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 329a572b2ae957460c3a89dd0c8db50ab78dd5b1..1f7aa73a15246c938c27f4e67da2edcfc068f43e 100644 (file)
@@ -2,5 +2,3 @@ moon::ipsec stop
 sun::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 sun::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-sun::rm /etc/ipsec.d/ipsec.*
index c2bbf858bb7002ce6a67df377dedfcfee31a2f95..f260b396c315b4a0075f556f21a34cadc58cb681 100644 (file)
@@ -1,9 +1,9 @@
 moon::rm /etc/ipsec.d/cacerts/*
 sun::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
-sun::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
-sun::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
+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::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 sun::ipsec start
index 10c582c9b97d964b6a538327ea98cf14003e77b3..ee97968ab1079d584eec985b4248258777c427b9 100644 (file)
@@ -10,7 +10,7 @@ VIRTHOSTS="alice venus moon winnetou sun bob"
 # Corresponding block diagram
 #
 DIAGRAM="a-v-m-w-s-b.png"
+
 # Guest instances on which tcpdump is to be started
 #
 TCPDUMPHOSTS="sun"
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="sun"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon sun"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 7e8023fcc02178702ea79e4f77784b2a87b8e535..4946b1520e553c413fda08b3f4612745a19d92e5 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 7e8023fcc02178702ea79e4f77784b2a87b8e535..4946b1520e553c413fda08b3f4612745a19d92e5 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index c02563c74a38c7b155e236a449b3c2a7d5c3d536..7fed45bedd961ea756fdfbc159616a25daf8e4ad 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index e9ad4bea60c33c249e0ddf0faec36603d1ccb5f6..1865a1c60eb1dcb5867d6c1d9bf6605f054c4757 100644 (file)
@@ -4,7 +4,3 @@ dave::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-dave::rm /etc/ipsec.d/ipsec.*
-~
index f0d045cb805bbfa180338b855600139af00e0bf2..0cea9d816ed461e77f6a01bffbc5fb27faf45358 100644 (file)
@@ -1,12 +1,12 @@
 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
index f292988506cd9f32494f96885953dd6645e93f3c..f6fb44f5f95f145647e8bc46344ce349970e8eac 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index ec5899c8408156f8bad456f0988584da53771ded..2fba94535a12aab088e60159c0b989692af48d16 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 fips-prf pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql eap-aka eap-aka-3gpp2
index 41951083c4264c249d2271fcb198bf0c8010c841..b06c611b76032a3a1dc38b528450f51bdb7a2906 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 fips-prf pem pkcs1 gmp random nonce x509 revocation hmac stroke kernel-netlink socket-default updown sqlite sql eap-aka eap-aka-3gpp2
index 584356d8edff1ed8df1210dd444b0df431477c81..046d4cfdc4678f1e7553cba9f099f029f7f6617f 100644 (file)
@@ -2,6 +2,3 @@ moon::ipsec stop
 carol::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-~
index 28d86d441704aca485cf426e8121c3334a1adaec..a6cbee7a98f2e5047d0fbbbe749ec26eaad41fc8 100644 (file)
@@ -1,9 +1,9 @@
 moon::rm /etc/ipsec.d/cacerts/*
 carol::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
-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
+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
+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
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
index 4a5fc470f0e67c4565d3360e777fb0ef6442ab2a..81b1d3bdb0b732eb98ea7c06b0f51cfeb72f0e25 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 5e4eb1246c43cf673679449c4e127d6aa834f7c8..e20fecca58ed6b3d627b1f35036f1cbc3c1db39e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce hmac stroke kernel-netlink socket-default updown sqlite sql
index 5e4eb1246c43cf673679449c4e127d6aa834f7c8..e20fecca58ed6b3d627b1f35036f1cbc3c1db39e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce hmac stroke kernel-netlink socket-default updown sqlite sql
index 5e4eb1246c43cf673679449c4e127d6aa834f7c8..e20fecca58ed6b3d627b1f35036f1cbc3c1db39e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce hmac stroke kernel-netlink socket-default updown sqlite sql
index e9ad4bea60c33c249e0ddf0faec36603d1ccb5f6..1865a1c60eb1dcb5867d6c1d9bf6605f054c4757 100644 (file)
@@ -4,7 +4,3 @@ dave::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-dave::rm /etc/ipsec.d/ipsec.*
-~
index f0d045cb805bbfa180338b855600139af00e0bf2..0cea9d816ed461e77f6a01bffbc5fb27faf45358 100644 (file)
@@ -1,12 +1,12 @@
 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
index f292988506cd9f32494f96885953dd6645e93f3c..f6fb44f5f95f145647e8bc46344ce349970e8eac 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 5e4eb1246c43cf673679449c4e127d6aa834f7c8..e20fecca58ed6b3d627b1f35036f1cbc3c1db39e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce hmac stroke kernel-netlink socket-default updown sqlite sql
index 5e4eb1246c43cf673679449c4e127d6aa834f7c8..e20fecca58ed6b3d627b1f35036f1cbc3c1db39e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce hmac stroke kernel-netlink socket-default updown sqlite sql
index 5e4eb1246c43cf673679449c4e127d6aa834f7c8..e20fecca58ed6b3d627b1f35036f1cbc3c1db39e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce hmac stroke kernel-netlink socket-default updown sqlite sql
index ab753507f5c2fc1261731fd95dd0d17a5886dc1e..4e59395e34af12d40a6d8a3b5961e510442a0724 100644 (file)
@@ -10,6 +10,3 @@ dave::ip6tables-restore < /etc/ip6tables.flush
 alice::"ip route del fec0:\:/16 via fec1:\:1"
 carol::"ip route del fec1:\:/16 via fec0:\:1"
 dave::"ip route del fec1:\:/16 via fec0:\:1"
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-dave::rm /etc/ipsec.d/ipsec.*
index f0455fc9f62d1db45105b74e2080ab2419275798..894689648163add62db19c9705d7567bbfde4db3 100644 (file)
@@ -1,12 +1,12 @@
 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
index 05bb8ab6dfc9ac7dd3a4cacae0569b62f454edd1..024105ebb36bc00887f69d49d79337d9d98d6318 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 174f8c29e24a1cad378b5c967ee55090419b8fb6..8b25be7aa30a37fe5ce45486ded439ba3310ef3e 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index e9ad4bea60c33c249e0ddf0faec36603d1ccb5f6..1865a1c60eb1dcb5867d6c1d9bf6605f054c4757 100644 (file)
@@ -4,7 +4,3 @@ dave::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.*
-carol::rm /etc/ipsec.d/ipsec.*
-dave::rm /etc/ipsec.d/ipsec.*
-~
index f0d045cb805bbfa180338b855600139af00e0bf2..0cea9d816ed461e77f6a01bffbc5fb27faf45358 100644 (file)
@@ -1,12 +1,12 @@
 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
index f292988506cd9f32494f96885953dd6645e93f3c..f6fb44f5f95f145647e8bc46344ce349970e8eac 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 4c06ca4dcfdd2dd36baf24472384491fdf08e2ae..75a2b06247e72c19e9a51e789304e8e1df12e0fe 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 pubkey gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 4c06ca4dcfdd2dd36baf24472384491fdf08e2ae..75a2b06247e72c19e9a51e789304e8e1df12e0fe 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 pubkey gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 4c06ca4dcfdd2dd36baf24472384491fdf08e2ae..75a2b06247e72c19e9a51e789304e8e1df12e0fe 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 pubkey gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 892650ccb6dc0c218da632bc359d7c15760ee2fc..1865a1c60eb1dcb5867d6c1d9bf6605f054c4757 100644 (file)
@@ -4,7 +4,3 @@ dave::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.db
-carol::rm /etc/ipsec.d/ipsec.db
-dave::rm /etc/ipsec.d/ipsec.db
-~
index f0d045cb805bbfa180338b855600139af00e0bf2..0cea9d816ed461e77f6a01bffbc5fb27faf45358 100644 (file)
@@ -1,12 +1,12 @@
 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
index f292988506cd9f32494f96885953dd6645e93f3c..f6fb44f5f95f145647e8bc46344ce349970e8eac 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 4c06ca4dcfdd2dd36baf24472384491fdf08e2ae..75a2b06247e72c19e9a51e789304e8e1df12e0fe 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 pubkey gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 4c06ca4dcfdd2dd36baf24472384491fdf08e2ae..75a2b06247e72c19e9a51e789304e8e1df12e0fe 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 pubkey gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 4c06ca4dcfdd2dd36baf24472384491fdf08e2ae..75a2b06247e72c19e9a51e789304e8e1df12e0fe 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db 
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 pubkey gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 892650ccb6dc0c218da632bc359d7c15760ee2fc..1865a1c60eb1dcb5867d6c1d9bf6605f054c4757 100644 (file)
@@ -4,7 +4,3 @@ dave::ipsec stop
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
-moon::rm /etc/ipsec.d/ipsec.db
-carol::rm /etc/ipsec.d/ipsec.db
-dave::rm /etc/ipsec.d/ipsec.db
-~
index f0d045cb805bbfa180338b855600139af00e0bf2..0cea9d816ed461e77f6a01bffbc5fb27faf45358 100644 (file)
@@ -1,12 +1,12 @@
 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
index f292988506cd9f32494f96885953dd6645e93f3c..f6fb44f5f95f145647e8bc46344ce349970e8eac 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="moon carol dave"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="$IPSECHOSTS"
index 7f02ba1201a64117ac351a3f1f78dac5b6c55baf..f4dd8f1998e742813a54c37069cd5ee80ca4857a 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index 6a89855a9aa2c8c3d01cc44599a364f93870112f..6210c21cc3198847d2b767e54100c1853254300e 100644 (file)
@@ -3,10 +3,10 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql attr-sql
index 7f02ba1201a64117ac351a3f1f78dac5b6c55baf..f4dd8f1998e742813a54c37069cd5ee80ca4857a 100644 (file)
@@ -3,7 +3,7 @@
 charon {
   plugins {
     sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite sql
index f410dd7769f8412dca864faef4b13c94d9ee32ea..e772be6af818bcf9c8de02b283b351ed7fb6cbec 100644 (file)
@@ -2,7 +2,4 @@ sun::ipsec stop
 alice::ipsec stop
 venus::ipsec stop
 sun::iptables-restore < /etc/iptables.flush
-alice::rm /etc/ipsec.d/ipsec.*
-venus::rm /etc/ipsec.d/ipsec.*
-sun::rm /etc/ipsec.d/ipsec.*
 moon::iptables -t nat -F
\ No newline at end of file
index 0314e7ad19a2ed062672e0bc1618f1864b788493..c23c09981c4feb144cb7e7a3c4bc1b9e1ced3a8c 100644 (file)
@@ -1,12 +1,12 @@
 alice::rm /etc/ipsec.d/cacerts/*
 venus::rm /etc/ipsec.d/cacerts/*
 sun::rm /etc/ipsec.d/cacerts/*
-alice::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/ipsec.d/ipsec.sql
-venus::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/ipsec.d/ipsec.sql
-sun::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/ipsec.d/ipsec.sql
-alice::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
-venus::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
+alice::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/db.d/ipsec.sql
+venus::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/db.d/ipsec.sql
+sun::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/db.d/ipsec.sql
+alice::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
+venus::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
 sun::iptables-restore < /etc/iptables.rules
 moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p udp -j SNAT --to-source PH_IP_MOON:1024-1100
 moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to-source PH_IP_MOON:2000-2100
index bd82f03ad6147d2c7c3bf179ba09c07526c5debd..d797acb064abcc2b21b4989166e50b13305b32f4 100644 (file)
@@ -19,3 +19,7 @@ TCPDUMPHOSTS="alice moon"
 # Used for IPsec logging purposes
 #
 IPSECHOSTS="alice venus sun"
+
+# Guest instances on which databases are used
+#
+DBHOSTS="alice venus sun"
index c5ddd386a9a48089bac47102ac43f8b95e194d53..1eab75a03637465dcfe030117f1d8916f8121e6f 100755 (executable)
@@ -14,7 +14,7 @@ charon {
 
   plugins {
     attr-sql {
-      database = sqlite:///etc/ipsec.d/ipsec.db
+      database = sqlite:///etc/db.d/ipsec.db
     }
   }
 }
index 4b88a6f4a66c6487fd33a0dc8796225e30a08771..91380e6f9e25292b36dd5f42cbe19a6d6121c89f 100755 (executable)
@@ -1,5 +1,5 @@
-moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/ipsec.d/ipsec.sql
-moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
+moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql > /etc/db.d/ipsec.sql
+moon::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
 moon::ipsec pool --add big_pool --start 10.3.0.1 --end 10.3.3.232 --timeout 0 2> /dev/null
 moon::ipsec pool --addattr dns  --server PH_IP_WINNETOU 2> /dev/null
 moon::ipsec pool --addattr dns  --server PH_IP_VENUS 2> /dev/null
index 1227b9d1c0621726c72b0079de3a23bc6d0581a1..5554b466961a570c44a93da9939b89118d0afd59 100755 (executable)
@@ -20,6 +20,10 @@ TCPDUMPHOSTS="moon"
 #
 IPSECHOSTS="moon carol dave"
 
+# Guest instances on which databases are used
+#
+DBHOSTS="moon"
+
 # charon controlled by swanctl
 #
 SWANCTL=1
index 23f840f69858d85d7df1226ebc83e22c9b204c0b..45845710bd30a8f57e704777723fe96c0c6d4104 100644 (file)
@@ -3,11 +3,11 @@
 libimcv {
   load = random nonce openssl pubkey sqlite
   debug_level = 3 
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
   policy_script = ipsec imv_policy_manager
   assessment_result = no
 }
 
 attest {
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
 }
index 9fe4fbfa2b7ca590bb6ff50326ca925abc6ea3c4..18e03746baadfb18a48ea83251334105357c31c9 100644 (file)
@@ -3,7 +3,6 @@ carol::ipsec stop
 dave::ipsec stop
 alice::killall radiusd
 alice::rm /etc/freeradius/sites-enabled/inner-tunnel-second
-alice::umount /etc/pts
 carol::echo 1 > /proc/sys/net/ipv4/ip_forward
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
index aeac9d38893b8af41e3ecddf9e77a67b38697de8..31ee7d1c71eb1b2820dc9cf6af9a81889033ab5d 100644 (file)
@@ -5,11 +5,8 @@ carol::echo 0 > /proc/sys/net/ipv4/ip_forward
 dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id
 alice::ln -s /etc/freeradius/sites-available/inner-tunnel-second /etc/freeradius/sites-enabled/inner-tunnel-second
 alice::cat /etc/freeradius/sites-enabled/inner-tunnel-second
-alice::mv /etc/pts/data1.sql /tmp/
-alice::mount -t ramfs -o size=5m ramfs /etc/pts
-alice::mv /tmp/data1.sql /etc/pts/
 alice::sed -i "s:DEBIAN_VERSION:\`cat /etc/debian_version\`:" /etc/pts/data1.sql
-alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
+alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db
 alice::LEAK_DETECTIVE_DISABLE=1 LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties radiusd
 alice::cat /etc/tnc_config
 carol::cat /etc/tnc_config
index f23a1932925d98818ea043c36ffc9b072049c20a..318dfdfcb65c892c02c4fa7050971e2683b4f505 100644 (file)
@@ -24,3 +24,6 @@ IPSECHOSTS="moon carol dave"
 #
 RADIUSHOSTS="alice"
 
+# Guest instances on which databases are used
+#
+DBHOSTS="alice"
index 88a4ad36e1620ff438e1dd8a8bda352e11e95692..c8992bdad550b33bcb3120e0e47903830af81886 100644 (file)
@@ -15,7 +15,7 @@ charon {
 }
 
 libimcv {
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
   policy_script = ipsec imv_policy_manager
   plugins {
     imv-attestation {
@@ -26,5 +26,5 @@ libimcv {
 
 attest {
   load = random nonce openssl sqlite
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
 }
index ec9be6145ea2922e8c53580fb4cec53bc5a9eaa5..74b902c696c7d00fdcd5a2ba0e6c8f9d43f2f97a 100644 (file)
@@ -5,4 +5,3 @@ moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
 carol::echo 1 > /proc/sys/net/ipv4/ip_forward
-moon::umount /etc/pts
index 5bfd6e77d7f6d0e0595a43005f8c5f626d90b804..345f54816337b0b4364774860846da9122aff3d3 100644 (file)
@@ -3,11 +3,8 @@ carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
 carol::echo 0 > /proc/sys/net/ipv4/ip_forward
 dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id
-moon::mv /etc/pts/data1.sql /tmp/
-moon::mount -t ramfs -o size=5m ramfs /etc/pts
-moon::mv /tmp/data1.sql /etc/pts/
 moon::sed -i "s:DEBIAN_VERSION:\`cat /etc/debian_version\`:" /etc/pts/data1.sql
-moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
+moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db
 moon::cat /etc/tnc_config
 carol::cat /etc/tnc_config
 dave::cat /etc/tnc_config
index a8a05af19d812033dcbe2015b5b7c10d46629f77..4b1c410ffac0f107a14fc1bd32c82eec9bd219b7 100644 (file)
@@ -20,7 +20,6 @@ TCPDUMPHOSTS="moon"
 #
 IPSECHOSTS="moon carol dave"
 
-# Guest instances on which FreeRadius is started
+# Guest instances on which databases are used
 #
-RADIUSHOSTS=
-
+DBHOSTS="moon"
index baa7dbbc832110a4fd1b3e35310ea7378f01d2b5..43cf395d997ab268f238eb7781d48eac25c72826 100644 (file)
@@ -15,11 +15,11 @@ charon {
 }
 
 libimcv {
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
   policy_script = ipsec imv_policy_manager
 }
 
 attest {
   load = random nonce openssl sqlite
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
 }
index ec9be6145ea2922e8c53580fb4cec53bc5a9eaa5..74b902c696c7d00fdcd5a2ba0e6c8f9d43f2f97a 100644 (file)
@@ -5,4 +5,3 @@ moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
 carol::echo 1 > /proc/sys/net/ipv4/ip_forward
-moon::umount /etc/pts
index dc43ed5166383eb7b0792710dca3492f0693a7de..3c5cd328eeb2af8f45d32f34834bffce23dda681 100644 (file)
@@ -3,12 +3,9 @@ carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
 carol::echo 0 > /proc/sys/net/ipv4/ip_forward
 dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id
-moon::mv /etc/pts/data1.sql /tmp/
-moon::mount -t ramfs -o size=5m ramfs /etc/pts
-moon::mv /tmp/data1.sql /etc/pts/
 moon::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql
 moon::sed -i "s:DEBIAN_VERSION:\`cat /etc/debian_version\`:" /etc/pts/data1.sql
-moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
+moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db
 moon::cat /etc/tnc_config
 carol::cat /etc/tnc_config
 dave::cat /etc/tnc_config
index a8a05af19d812033dcbe2015b5b7c10d46629f77..f4fd4dc1674da6eb9086280023e01b467579dea0 100644 (file)
@@ -20,7 +20,6 @@ TCPDUMPHOSTS="moon"
 #
 IPSECHOSTS="moon carol dave"
 
-# Guest instances on which FreeRadius is started
+# Guest instances on which databases are used
 #
-RADIUSHOSTS=
-
+DBHOSTS="moon"
\ No newline at end of file
index 5e7b7b556951ef61677f6523e0063fb173ab7e02..ea9cbbee4756f32abe676743a77ad0060b559983 100644 (file)
@@ -5,7 +5,7 @@ DEBUG_TOOLBAR=0
 
 [db]
 DJANGO_DB_URL=sqlite:////var/www/tnc/django.db
-STRONGTNC_DB_URL = sqlite:////etc/pts/config.db
+STRONGTNC_DB_URL = sqlite:////etc/db.d/config.db
 
 [localization]
 LANGUAGE_CODE=en-us
index 1c34f51f8cfff777dcf5bc73b522bb930227c4d8..48d5d70f01abfab6e0fd6e02bb29ca98edd47eb8 100644 (file)
@@ -24,7 +24,7 @@ charon {
 
 libimcv {
   debug_level = 3 
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
   policy_script = ipsec imv_policy_manager
 
   plugins {
index 319ec495c408f71f72ac94393aa39ed860932fbd..fe9f59e44bcb1f52c377460074f94cfaacf7fa2e 100644 (file)
@@ -3,7 +3,6 @@ carol::ipsec stop
 dave::ipsec stop
 alice::ipsec stop
 alice::service apache2 stop
-alice::umount /etc/pts
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
index b892dd5451feeeda875a592285ef60e4e8f8f4cd..4b8d3f024d7c6658cb7e7c6f56de9ab52f4385af 100644 (file)
@@ -6,13 +6,10 @@ carol::cat /etc/tnc_config
 dave::cat /etc/tnc_config
 carol::echo 0 > /proc/sys/net/ipv4/ip_forward
 dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id
-alice::mv /etc/pts/data1.sql /tmp/
-alice::mount -t ramfs -o size=5m ramfs /etc/pts
-alice::mv /tmp/data1.sql /etc/pts/
 alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql
 alice::sed -i "s:DEBIAN_VERSION:\`cat /etc/debian_version\`:" /etc/pts/data1.sql
-alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
-alice::chgrp -R www-data /etc/pts; chmod -R g+w /etc/pts
+alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db
+alice::chgrp -R www-data /etc/db.d/config.db; chmod -R g+w /etc/db.d/config.db
 alice::/var/www/tnc/manage.py setpassword strongSwan strongSwan
 alice::service apache2 start
 alice::ipsec start
index c4ca1a19f1022fc10860a0d8b2f136fdf3024658..345e9115089e8cda0e9be4df764770677a25139c 100644 (file)
@@ -20,7 +20,7 @@ TCPDUMPHOSTS="moon"
 #
 IPSECHOSTS="moon carol dave alice"
 
-# Guest instances on which FreeRadius is started
+# Guest instances on which databases are used
 #
-RADIUSHOSTS=
+DBHOSTS="alice"
 
index 5e7b7b556951ef61677f6523e0063fb173ab7e02..ea9cbbee4756f32abe676743a77ad0060b559983 100644 (file)
@@ -5,7 +5,7 @@ DEBUG_TOOLBAR=0
 
 [db]
 DJANGO_DB_URL=sqlite:////var/www/tnc/django.db
-STRONGTNC_DB_URL = sqlite:////etc/pts/config.db
+STRONGTNC_DB_URL = sqlite:////etc/db.d/config.db
 
 [localization]
 LANGUAGE_CODE=en-us
index 857e6d6d63f7039a65d93dd0bd3ef7b28f92a328..5fa49e7a7aed2b9116fdca68da923f56fc9d35a9 100644 (file)
@@ -18,7 +18,7 @@ libtls {
 }
 
 libimcv {
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
   policy_script = ipsec imv_policy_manager
 
   plugins {
index c4f591a62f77f045ae92f0a9179e58e44a145fc7..2f45a149d9ccafcde3601f49f086a0954fd34f56 100644 (file)
@@ -3,7 +3,6 @@ dave::ip route del 10.1.0.0/16 via 192.168.0.1
 winnetou::ip route del 10.1.0.0/16 via 192.168.0.1
 alice::ipsec stop
 alice::service apache2 stop
-alice::umount /etc/pts
 alice::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
index 8c6974e03138058c7d51c677c1ce54fcc6d68cbd..e14ba8902e414d5c07701f224596f91e97094372 100644 (file)
@@ -6,13 +6,10 @@ carol::cat /etc/tnc_config
 carol::echo 0 > /proc/sys/net/ipv4/ip_forward
 dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id
 dave::cat /etc/tnc_config
-alice::mv /etc/pts/data1.sql /tmp/
-alice::mount -t ramfs -o size=5m ramfs /etc/pts
-alice::mv /tmp/data1.sql /etc/pts/
 alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql
 alice::sed -i "s:DEBIAN_VERSION:\`cat /etc/debian_version\`:" /etc/pts/data1.sql
-alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
-alice::chgrp -R www-data /etc/pts; chmod -R g+w /etc/pts
+alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db
+alice::chgrp -R www-data /etc/db.d/config.db; chmod -R g+w /etc/db.d/config.db
 alice::/var/www/tnc/manage.py setpassword strongSwan strongSwan
 alice::service apache2 start
 alice::ipsec start
index 5f4f8e7251326d8b3fae9b3ee8162cf5a8984584..baeceb92bce9343ba32d1246efd9f425530e2246 100644 (file)
@@ -20,7 +20,6 @@ TCPDUMPHOSTS="moon"
 #
 IPSECHOSTS="carol moon dave alice"
 
-# Guest instances on which FreeRadius is started
+# Guest instances on which databases are used
 #
-RADIUSHOSTS=
-
+DBHOSTS="alice"
index e72ab09200a31f443b4deae268f3fb1a005c464c..38b2e2ec24f06b0754fb948615fe3438bbd97e78 100644 (file)
@@ -15,7 +15,7 @@ charon {
 }
 
 libimcv {
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
   policy_script = ipsec imv_policy_manager
   plugins {
     imv-attestation {
@@ -28,5 +28,5 @@ libimcv {
 
 attest {
   load = random nonce openssl sqlite
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
 }
index ec9be6145ea2922e8c53580fb4cec53bc5a9eaa5..74b902c696c7d00fdcd5a2ba0e6c8f9d43f2f97a 100644 (file)
@@ -5,4 +5,3 @@ moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
 carol::echo 1 > /proc/sys/net/ipv4/ip_forward
-moon::umount /etc/pts
index 5bfd6e77d7f6d0e0595a43005f8c5f626d90b804..345f54816337b0b4364774860846da9122aff3d3 100644 (file)
@@ -3,11 +3,8 @@ carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
 carol::echo 0 > /proc/sys/net/ipv4/ip_forward
 dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id
-moon::mv /etc/pts/data1.sql /tmp/
-moon::mount -t ramfs -o size=5m ramfs /etc/pts
-moon::mv /tmp/data1.sql /etc/pts/
 moon::sed -i "s:DEBIAN_VERSION:\`cat /etc/debian_version\`:" /etc/pts/data1.sql
-moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
+moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db
 moon::cat /etc/tnc_config
 carol::cat /etc/tnc_config
 dave::cat /etc/tnc_config
index a8a05af19d812033dcbe2015b5b7c10d46629f77..2fd3139f5859d24f502602dabaf101a69057b0a3 100644 (file)
@@ -20,7 +20,7 @@ TCPDUMPHOSTS="moon"
 #
 IPSECHOSTS="moon carol dave"
 
-# Guest instances on which FreeRadius is started
+# Guest instances on which databases are used
 #
-RADIUSHOSTS=
+DBHOSTS="moon"
 
index 68e4a4689cfac8d1fe3b53f29d6b4139abfba173..d9d0624f5d7131bdd50958ad50d0cf369a026c50 100644 (file)
@@ -17,7 +17,7 @@ charon {
 }
 
 libimcv {
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
   policy_script = ipsec imv_policy_manager
   plugins {
     imv-attestation {
@@ -28,5 +28,5 @@ libimcv {
 
 attest {
   load = random nonce openssl sqlite
-  database = sqlite:///etc/pts/config.db
+  database = sqlite:///etc/db.d/config.db
 }
index ec9be6145ea2922e8c53580fb4cec53bc5a9eaa5..74b902c696c7d00fdcd5a2ba0e6c8f9d43f2f97a 100644 (file)
@@ -5,4 +5,3 @@ moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush
 carol::echo 1 > /proc/sys/net/ipv4/ip_forward
-moon::umount /etc/pts
index 5bfd6e77d7f6d0e0595a43005f8c5f626d90b804..345f54816337b0b4364774860846da9122aff3d3 100644 (file)
@@ -3,11 +3,8 @@ carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
 carol::echo 0 > /proc/sys/net/ipv4/ip_forward
 dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id
-moon::mv /etc/pts/data1.sql /tmp/
-moon::mount -t ramfs -o size=5m ramfs /etc/pts
-moon::mv /tmp/data1.sql /etc/pts/
 moon::sed -i "s:DEBIAN_VERSION:\`cat /etc/debian_version\`:" /etc/pts/data1.sql
-moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/pts/config.db
+moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db
 moon::cat /etc/tnc_config
 carol::cat /etc/tnc_config
 dave::cat /etc/tnc_config
index a8a05af19d812033dcbe2015b5b7c10d46629f77..2fd3139f5859d24f502602dabaf101a69057b0a3 100644 (file)
@@ -20,7 +20,7 @@ TCPDUMPHOSTS="moon"
 #
 IPSECHOSTS="moon carol dave"
 
-# Guest instances on which FreeRadius is started
+# Guest instances on which databases are used
 #
-RADIUSHOSTS=
+DBHOSTS="moon"