diff options
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/test_testbed_api.conf | 1 | ||||
-rw-r--r-- | src/testbed/testbed.conf.in | 3 |
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 | |||
62 | HOSTKEY = $SERVICEHOME/.hostkey | 62 | HOSTKEY = $SERVICEHOME/.hostkey |
63 | 63 | ||
64 | [PATHS] | 64 | [PATHS] |
65 | DEFAULTCONFIG = test_testbed_api.conf | ||
66 | SERVICEHOME = /tmp/test-testbed/ | 65 | SERVICEHOME = /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 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-testbed | 6 | BINARY = gnunet-service-testbed |
8 | ACCEPT_FROM = 127.0.0.1; | 7 | ACCEPT_FROM = 127.0.0.1; |
9 | ACCEPT_FROM6 = ::1; | 8 | ACCEPT_FROM6 = ::1; |
@@ -12,4 +11,4 @@ UNIX_MATCH_UID = YES | |||
12 | UNIX_MATCH_GID = YES | 11 | UNIX_MATCH_GID = YES |
13 | MAX_PARALLEL_OPERATIONS = 1000 | 12 | MAX_PARALLEL_OPERATIONS = 1000 |
14 | MAX_PARALLEL_SERVICE_CONNECTIONS = 1000 | 13 | MAX_PARALLEL_SERVICE_CONNECTIONS = 1000 |
15 | MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 \ No newline at end of file | 14 | MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 |