aboutsummaryrefslogtreecommitdiff
path: root/src/testbed
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed')
-rw-r--r--src/testbed/test_testbed_api.conf1
-rw-r--r--src/testbed/testbed.conf.in3
2 files changed, 1 insertions, 3 deletions
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf
index 9fdb9bcda..2fdefcc1f 100644
--- a/src/testbed/test_testbed_api.conf
+++ b/src/testbed/test_testbed_api.conf
@@ -62,7 +62,6 @@ PEERGROUP_TIMEOUT = 2400 s
62HOSTKEY = $SERVICEHOME/.hostkey 62HOSTKEY = $SERVICEHOME/.hostkey
63 63
64[PATHS] 64[PATHS]
65DEFAULTCONFIG = test_testbed_api.conf
66SERVICEHOME = /tmp/test-testbed/ 65SERVICEHOME = /tmp/test-testbed/
67 66
68[dns] 67[dns]
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 5f5585c04..ccd9c4f79 100644
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -3,7 +3,6 @@ AUTOSTART = NO
3@UNIXONLY@ PORT = 2101 3@UNIXONLY@ PORT = 2101
4HOSTNAME = localhost 4HOSTNAME = localhost
5HOME = $SERVICEHOME 5HOME = $SERVICEHOME
6CONFIG = $DEFAULTCONFIG
7BINARY = gnunet-service-testbed 6BINARY = gnunet-service-testbed
8ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
@@ -12,4 +11,4 @@ UNIX_MATCH_UID = YES
12UNIX_MATCH_GID = YES 11UNIX_MATCH_GID = YES
13MAX_PARALLEL_OPERATIONS = 1000 12MAX_PARALLEL_OPERATIONS = 1000
14MAX_PARALLEL_SERVICE_CONNECTIONS = 1000 13MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
15MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 \ No newline at end of file 14MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5