testing: Move collector.db in tnc/tnccs-20-ev-pt-tls scenario to /etc/db.d

Also move initialization to the pretest script (it's way faster in the
in-memory database).

diff --git a/testing/hosts/alice/etc/strongswan.conf b/testing/hosts/alice/etc/strongswan.conf
index 575fd0fb20a7038b4f5ea8ca1b33477bedaefdbe..bc0ddbf33eaeaa2dc06dcf5290b6a79ffc30916c 100644 (file)
--- a/testing/hosts/alice/etc/strongswan.conf
+++ b/testing/hosts/alice/etc/strongswan.conf
@@ -3,8 +3,3 @@
 charon {
   load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints curve25519 pubkey gmp random nonce curl kernel-netlink socket-default updown stroke vici
 }
-
-sw-collector {
-  database = sqlite:///etc/pts/collector.db
-  history = /var/log/apt/history.log
-}

diff --git a/testing/hosts/bob/etc/strongswan.conf b/testing/hosts/bob/etc/strongswan.conf
index 575fd0fb20a7038b4f5ea8ca1b33477bedaefdbe..bc0ddbf33eaeaa2dc06dcf5290b6a79ffc30916c 100644 (file)
--- a/testing/hosts/bob/etc/strongswan.conf
+++ b/testing/hosts/bob/etc/strongswan.conf
@@ -3,8 +3,3 @@
 charon {
   load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints curve25519 pubkey gmp random nonce curl kernel-netlink socket-default updown stroke vici
 }
-
-sw-collector {
-  database = sqlite:///etc/pts/collector.db
-  history = /var/log/apt/history.log
-}

diff --git a/testing/hosts/carol/etc/strongswan.conf b/testing/hosts/carol/etc/strongswan.conf
index 575fd0fb20a7038b4f5ea8ca1b33477bedaefdbe..bc0ddbf33eaeaa2dc06dcf5290b6a79ffc30916c 100644 (file)
--- a/testing/hosts/carol/etc/strongswan.conf
+++ b/testing/hosts/carol/etc/strongswan.conf
@@ -3,8 +3,3 @@
 charon {
   load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints curve25519 pubkey gmp random nonce curl kernel-netlink socket-default updown stroke vici
 }
-
-sw-collector {
-  database = sqlite:///etc/pts/collector.db
-  history = /var/log/apt/history.log
-}

diff --git a/testing/hosts/dave/etc/strongswan.conf b/testing/hosts/dave/etc/strongswan.conf
index 575fd0fb20a7038b4f5ea8ca1b33477bedaefdbe..bc0ddbf33eaeaa2dc06dcf5290b6a79ffc30916c 100644 (file)
--- a/testing/hosts/dave/etc/strongswan.conf
+++ b/testing/hosts/dave/etc/strongswan.conf
@@ -3,8 +3,3 @@
 charon {
   load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints curve25519 pubkey gmp random nonce curl kernel-netlink socket-default updown stroke vici
 }
-
-sw-collector {
-  database = sqlite:///etc/pts/collector.db
-  history = /var/log/apt/history.log
-}

diff --git a/testing/hosts/default/usr/local/bin/init_collector b/testing/hosts/default/usr/local/bin/init_collector
index 12ec683c6a1a22086b3ccd6f0d52bd5c85c6d92c..c522de8742e39b0d6d59119d2cb7e7dd76b30c86 100755 (executable)
--- a/testing/hosts/default/usr/local/bin/init_collector
+++ b/testing/hosts/default/usr/local/bin/init_collector
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-cat /usr/local/share/strongswan/templates/database/sw-collector/sw_collector_tables.sql | sqlite3 /etc/pts/collector.db
+cat /usr/local/share/strongswan/templates/database/sw-collector/sw_collector_tables.sql | sqlite3 /etc/db.d/collector.db
 LEAK_DETECTIVE_DISABLE=1 /usr/local/sbin/sw-collector

diff --git a/testing/hosts/moon/etc/strongswan.conf b/testing/hosts/moon/etc/strongswan.conf
index 575fd0fb20a7038b4f5ea8ca1b33477bedaefdbe..bc0ddbf33eaeaa2dc06dcf5290b6a79ffc30916c 100644 (file)
--- a/testing/hosts/moon/etc/strongswan.conf
+++ b/testing/hosts/moon/etc/strongswan.conf
@@ -3,8 +3,3 @@
 charon {
   load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints curve25519 pubkey gmp random nonce curl kernel-netlink socket-default updown stroke vici
 }
-
-sw-collector {
-  database = sqlite:///etc/pts/collector.db
-  history = /var/log/apt/history.log
-}

diff --git a/testing/hosts/sun/etc/strongswan.conf b/testing/hosts/sun/etc/strongswan.conf
index 575fd0fb20a7038b4f5ea8ca1b33477bedaefdbe..bc0ddbf33eaeaa2dc06dcf5290b6a79ffc30916c 100644 (file)
--- a/testing/hosts/sun/etc/strongswan.conf
+++ b/testing/hosts/sun/etc/strongswan.conf
@@ -3,8 +3,3 @@
 charon {
   load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints curve25519 pubkey gmp random nonce curl kernel-netlink socket-default updown stroke vici
 }
-
-sw-collector {
-  database = sqlite:///etc/pts/collector.db
-  history = /var/log/apt/history.log
-}

diff --git a/testing/hosts/venus/etc/strongswan.conf b/testing/hosts/venus/etc/strongswan.conf
index 575fd0fb20a7038b4f5ea8ca1b33477bedaefdbe..bc0ddbf33eaeaa2dc06dcf5290b6a79ffc30916c 100644 (file)
--- a/testing/hosts/venus/etc/strongswan.conf
+++ b/testing/hosts/venus/etc/strongswan.conf
@@ -3,8 +3,3 @@
 charon {
   load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 revocation constraints curve25519 pubkey gmp random nonce curl kernel-netlink socket-default updown stroke vici
 }
-
-sw-collector {
-  database = sqlite:///etc/pts/collector.db
-  history = /var/log/apt/history.log
-}

diff --git a/testing/hosts/winnetou/etc/strongswan.conf b/testing/hosts/winnetou/etc/strongswan.conf
index b9b96e48d4a627ed9ab2b5f3e38e6a62389e3d6e..a69df79abdde7e0d3dd8a4b1d773f6c34d79c02d 100644 (file)
--- a/testing/hosts/winnetou/etc/strongswan.conf
+++ b/testing/hosts/winnetou/etc/strongswan.conf
@@ -3,8 +3,3 @@
 pki {
   load = random pem sha1 sha2 sha3 pkcs1 pkcs8 pem gmp mgf1 bliss curve25519 x509
 }
-
-sw-collector {
-  database = sqlite:///etc/pts/collector.db
-  history = /var/log/apt/history.log
-}

diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index 278379b93f9417d357b6be8b415d10c0698b5005..7dd7188c2c069e9bdafb1c46a46eb88acbf1b62c 100755 (executable)
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -50,10 +50,6 @@ do
        execute_chroot "ldconfig" 0
        execute "mkdir $LOOPDIR/etc/pts" 0
 
-       if [ "$host" = "carol" ]
-       then
-               execute_chroot "/usr/local/bin/init_collector" 0
-       fi
        if [ "$host" = "alice" ]
        then
                execute "mkdir $LOOPDIR/var/log/apache2/tnc" 0

diff --git a/testing/scripts/build-strongswan b/testing/scripts/build-strongswan
index 8c6ecaafd4501f32c105ff5f5fb339b4052741fb..d4e9e922f11e75726b88ff7f6dbfe27c14e257b0 100755 (executable)
--- a/testing/scripts/build-strongswan
+++ b/testing/scripts/build-strongswan
@@ -51,6 +51,7 @@ do_on_exit umount $LOOPDIR/root/strongswan
 
 log_action "Remove SWID tags of previous versions"
 execute_chroot 'find /usr/local/share/regid.2004-03.org.strongswan -name *.swidtag -delete'
+execute_chroot 'find /usr/local/share/strongswan -name *.swidtag -delete'
 
 echo "Building and installing strongSwan"
 

diff --git a/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/carol/etc/strongswan.conf
index 8fba7413a26b9a485e30cd4b1c014409b5dce156..87c3745a31d25a5e1705c8a857e11161dbf8ee41 100644 (file)
--- a/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/carol/etc/strongswan.conf
@@ -7,7 +7,7 @@ libtls {
 libimcv {
   plugins {
     imc-swima {
-      swid_database = sqlite:///etc/pts/collector.db
+      swid_database = sqlite:///etc/db.d/collector.db
     }
   }
 }

diff --git a/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat b/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat
index d8ac3ab41b04316a9fee1c7934b67ecc3bdbe81f..c0d732368e63e0df9d51999223de1abcf71ac4d4 100644 (file)
--- a/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat
+++ b/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat
@@ -20,6 +20,7 @@ winnetou::ip route add 10.1.0.0/16 via 192.168.0.1
 dave::ip route add 10.1.0.0/16 via 192.168.0.1
 dave::cat /etc/pts/options
 dave::/usr/local/bin/pt-tls-client --optionsfrom /etc/pts/options
+carol::/usr/local/bin/init_collector
 carol::ip route add 10.1.0.0/16 via 192.168.0.1
 carol::cat /etc/pts/options
 carol::/usr/local/bin/pt-tls-client --optionsfrom /etc/pts/options

diff --git a/testing/tests/tnc/tnccs-20-ev-pt-tls/test.conf b/testing/tests/tnc/tnccs-20-ev-pt-tls/test.conf
index 08ea543e2fe3f03883ec03db0b73067235f6d2c6..f434789b9c80f2cdbb6b15791c24a87a2c0c8e56 100644 (file)
--- a/testing/tests/tnc/tnccs-20-ev-pt-tls/test.conf
+++ b/testing/tests/tnc/tnccs-20-ev-pt-tls/test.conf
@@ -22,7 +22,7 @@ IPSECHOSTS="carol moon dave alice"
 
 # Guest instances on which databases are used
 #
-DBHOSTS="alice"
+DBHOSTS="alice carol"
 
 # charon controlled by swanctl
 #