aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2015-09-21 11:15:20 +0200
committerTobias Brunner <tobias@strongswan.org>2015-11-09 15:18:34 +0100
commit9a0871ab94f8f9f7ec60eea0d30fc44476af2c14 (patch)
treedc39555e2b8ed9f3cbb470494e18b8c39b381242
parentbd5084ae252867705e26e2cfbc4b74fadbc7126c (diff)
downloadstrongswan-9a0871ab94f8f9f7ec60eea0d30fc44476af2c14.tar.bz2
strongswan-9a0871ab94f8f9f7ec60eea0d30fc44476af2c14.tar.xz
testing: Add a base strongswan.conf file used by all hosts in all scenarios
We will use this to set some defaults (e.g. timeouts to make testing negative tests quicker). We don't want these settings to show up in the configs of the actual scenarios though.
-rw-r--r--testing/hosts/default/etc/strongswan.conf.testing1
-rw-r--r--testing/scripts/recipes/013_strongswan.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/testing/hosts/default/etc/strongswan.conf.testing b/testing/hosts/default/etc/strongswan.conf.testing
new file mode 100644
index 000000000..0f1a13314
--- /dev/null
+++ b/testing/hosts/default/etc/strongswan.conf.testing
@@ -0,0 +1 @@
+include strongswan.conf \ No newline at end of file
diff --git a/testing/scripts/recipes/013_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk
index 7acd3651c..3ab33f6fd 100644
--- a/testing/scripts/recipes/013_strongswan.mk
+++ b/testing/scripts/recipes/013_strongswan.mk
@@ -18,6 +18,7 @@ NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
CONFIG_OPTS = \
--sysconfdir=/etc \
+ --with-strongswan-conf=/etc/strongswan.conf.testing \
--with-random-device=/dev/urandom \
--disable-load-warning \
--enable-curl \