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).
This commit is contained in:
Tobias Brunner
2017-08-07 16:55:45 +02:00
parent 6fadc6a859
commit f058804df8
14 changed files with 5 additions and 47 deletions
-5
View File
@@ -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
}
-5
View File
@@ -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
}
-5
View File
@@ -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
}
-5
View File
@@ -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
}
@@ -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
-5
View File
@@ -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
}
-5
View File
@@ -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
}
-5
View File
@@ -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
}
@@ -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
}