summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-05-12 13:10:20 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-05-12 13:10:20 +0000
commitf8e7538e60434dd3ea0548dedc6ab8fd73f46666 (patch)
tree61c5259a670baa2bdd76a991f6f16f24bbad1cb4 /src
parentcc2c6e99a4a80cc06020be5a63f1c2f3ddf458fb (diff)
disable mesh autostart
Diffstat (limited to 'src')
-rw-r--r--src/transport/test_plugin_transport_data.conf2
-rw-r--r--src/transport/test_plugin_transport_data_http.conf3
-rw-r--r--src/transport/test_plugin_transport_data_udp.conf3
-rw-r--r--src/transport/test_quota_compliance_data.conf3
-rw-r--r--src/transport/test_quota_compliance_http_peer1.conf3
-rw-r--r--src/transport/test_quota_compliance_http_peer2.conf13
-rw-r--r--src/transport/test_quota_compliance_https_peer1.conf3
-rw-r--r--src/transport/test_quota_compliance_https_peer2.conf12
-rw-r--r--src/transport/test_quota_compliance_tcp_peer1.conf3
-rw-r--r--src/transport/test_quota_compliance_tcp_peer2.conf13
-rw-r--r--src/transport/test_quota_compliance_udp_peer1.conf2
-rw-r--r--src/transport/test_quota_compliance_udp_peer2.conf13
-rw-r--r--src/transport/test_quota_compliance_unix_peer1.conf2
-rw-r--r--src/transport/test_quota_compliance_unix_peer2.conf13
-rw-r--r--src/transport/test_transport_api_data.conf2
-rw-r--r--src/transport/test_transport_api_http_peer1.conf2
-rw-r--r--src/transport/test_transport_api_http_peer2.conf13
-rw-r--r--src/transport/test_transport_api_https_peer1.conf15
-rw-r--r--src/transport/test_transport_api_https_peer2.conf13
-rw-r--r--src/transport/test_transport_api_multi_peer1.conf2
-rw-r--r--src/transport/test_transport_api_multi_peer2.conf13
-rw-r--r--src/transport/test_transport_api_rel_http_peer1.conf2
-rw-r--r--src/transport/test_transport_api_rel_http_peer2.conf13
-rw-r--r--src/transport/test_transport_api_rel_https_peer1.conf2
-rw-r--r--src/transport/test_transport_api_rel_https_peer2.conf13
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer1.conf15
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer2.conf2
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf13
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf13
-rw-r--r--src/transport/test_transport_api_udp_nat_peer1.conf4
-rw-r--r--src/transport/test_transport_api_udp_nat_peer2.conf13
-rw-r--r--src/transport/test_transport_api_udp_peer1.conf2
-rw-r--r--src/transport/test_transport_api_udp_peer2.conf13
-rw-r--r--src/transport/test_transport_api_unix_peer1.conf3
-rw-r--r--src/transport/test_transport_api_unix_peer2.conf13
-rw-r--r--src/transport/test_transport_api_wlan_peer1.conf2
-rw-r--r--src/transport/test_transport_api_wlan_peer2.conf13
-rw-r--r--src/transport/test_transport_ats_1addr.conf2
-rw-r--r--src/transport/test_transport_ats_2addr.conf2
-rw-r--r--src/transport/test_transport_ats_4addr.conf2
40 files changed, 103 insertions, 187 deletions
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index 88f590e56..260b220ea 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -26,4 +26,6 @@ WEAKRANDOM = YES
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf
index 6e5e2d44c..c3261f60c 100644
--- a/src/transport/test_plugin_transport_data_http.conf
+++ b/src/transport/test_plugin_transport_data_http.conf
@@ -54,4 +54,5 @@ PORT = 12366
[dht]
AUTOSTART = NO
-
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_plugin_transport_data_udp.conf b/src/transport/test_plugin_transport_data_udp.conf
index 001f71d5b..66111bda2 100644
--- a/src/transport/test_plugin_transport_data_udp.conf
+++ b/src/transport/test_plugin_transport_data_udp.conf
@@ -26,4 +26,5 @@ WEAKRANDOM = YES
[dht]
AUTOSTART = NO
-
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf
index 88f590e56..cc9316534 100644
--- a/src/transport/test_quota_compliance_data.conf
+++ b/src/transport/test_quota_compliance_data.conf
@@ -26,4 +26,5 @@ WEAKRANDOM = YES
[dht]
AUTOSTART = NO
-
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 8c356bf32..c645d3916 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -105,4 +105,5 @@ HOSTKEY = $SERVICEHOME/.hostkey
[dht]
AUTOSTART = NO
-
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index 710dbc881..0dd81dd92 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -106,14 +106,5 @@ HOSTKEY = $SERVICEHOME/.hostkey
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index 4350c2285..1eb9c0df1 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -111,3 +111,6 @@ HOSTKEY = $SERVICEHOME/.hostkey
[dht]
AUTOSTART = NO
+
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index bd2ffc319..692004b0f 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -114,14 +114,4 @@ HOSTKEY = $SERVICEHOME/.hostkey
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index fb3d91939..767423483 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -111,4 +111,5 @@ HOSTKEY = $SERVICEHOME/.hostkey
[dht]
AUTOSTART = NO
-
+[mesh]
+AUTOSTART = NO \ No newline at end of file
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 649a07e53..19b531f51 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -112,14 +112,5 @@ HOSTKEY = $SERVICEHOME/.hostkey
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index ba7c8c0e2..8d8bfce0e 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -101,4 +101,6 @@ HOSTKEY = $SERVICEHOME/.hostkey
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index c473cbd10..1a2fb3844 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -100,14 +100,5 @@ HOSTKEY = $SERVICEHOME/.hostkey
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index ff8ef0537..cd42ea838 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -101,4 +101,6 @@ HOSTKEY = $SERVICEHOME/.hostkey
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index c0fd3d54d..7f113df25 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -100,14 +100,5 @@ HOSTKEY = $SERVICEHOME/.hostkey
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf
index cb90a47a7..f306e4b0c 100644
--- a/src/transport/test_transport_api_data.conf
+++ b/src/transport/test_transport_api_data.conf
@@ -99,4 +99,6 @@ HOSTKEY = $SERVICEHOME/.hostkey
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index e0e5aeea6..4f66c1138 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -120,4 +120,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index e971a7d33..39096dfa6 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -126,14 +126,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index 712cd970a..f2bb24374 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -104,7 +104,18 @@ BINARY = gnunet-service-arm
CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
-PORT = 12366
+PORT = 12366[mesh]
+AUTOSTART = YES
+PORT = 10512
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-mesh
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-mesh2.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
UNIXPATH = /tmp/gnunet-p1-service-arm.sock
[transport-tcp]
@@ -125,4 +136,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index c03e4f59b..442746c4b 100644
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -131,14 +131,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 2e95a5bd8..595284fa6 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -132,4 +132,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-1/
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 53254123f..99ab5f8d5 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -145,14 +145,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-2/
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_rel_http_peer1.conf b/src/transport/test_transport_api_rel_http_peer1.conf
index 05b7a2161..f7a6e8e5f 100644
--- a/src/transport/test_transport_api_rel_http_peer1.conf
+++ b/src/transport/test_transport_api_rel_http_peer1.conf
@@ -123,4 +123,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf
index 0b3da5074..b8a6871ac 100644
--- a/src/transport/test_transport_api_rel_http_peer2.conf
+++ b/src/transport/test_transport_api_rel_http_peer2.conf
@@ -130,14 +130,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf
index 3ac60d792..970bdd994 100644
--- a/src/transport/test_transport_api_rel_https_peer1.conf
+++ b/src/transport/test_transport_api_rel_https_peer1.conf
@@ -125,4 +125,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf
index 534a13b47..9df2d0b53 100644
--- a/src/transport/test_transport_api_rel_https_peer2.conf
+++ b/src/transport/test_transport_api_rel_https_peer2.conf
@@ -131,14 +131,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 714686231..682edf989 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -97,7 +97,18 @@ UNIXPATH = /tmp/gnunet-p1-service-arm.sock
[transport-tcp]
TIMEOUT = 300000
-PORT = 12368
+PORT = 12368[mesh]
+AUTOSTART = NO
+PORT = 10511
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-mesh
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-mesh.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
[TESTING]
WEAKRANDOM = YES
@@ -114,4 +125,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index b681de711..c3e4e1f01 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -114,4 +114,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index 878c17590..d28a92e7c 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -111,14 +111,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10511
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index 129dc938e..0961f3369 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -112,14 +112,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index db3940cb7..0188b970f 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -111,8 +111,6 @@ HOSTKEY = $SERVICEHOME/.hostkey
DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf
SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
-
-[dht]
+[mesh]
AUTOSTART = NO
-
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index b3c3ca2bd..65e8b1d67 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -124,14 +124,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index e74be1d8f..2742525b5 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -108,4 +108,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index f9d499c52..dfdec745e 100644
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -117,14 +117,5 @@ UNIX_MATCH_GID = YES
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
index e1e5a7f57..13b4d6361 100644
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ b/src/transport/test_transport_api_unix_peer1.conf
@@ -101,10 +101,11 @@ HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
DEFAULTCONFIG = test_transport_api_unix_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
index eb7ee5b69..9deac9cd8 100644
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ b/src/transport/test_transport_api_unix_peer2.conf
@@ -106,14 +106,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index fd3abebd5..eb7c246cd 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -106,4 +106,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index e7199ed40..4dbc32832 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -118,14 +118,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
AUTOSTART = NO
[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+AUTOSTART = NO
+
diff --git a/src/transport/test_transport_ats_1addr.conf b/src/transport/test_transport_ats_1addr.conf
index 5e64f46d8..076e36947 100644
--- a/src/transport/test_transport_ats_1addr.conf
+++ b/src/transport/test_transport_ats_1addr.conf
@@ -65,4 +65,6 @@ AUTOSTART = NO
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_ats_2addr.conf b/src/transport/test_transport_ats_2addr.conf
index c92994ad0..440e57447 100644
--- a/src/transport/test_transport_ats_2addr.conf
+++ b/src/transport/test_transport_ats_2addr.conf
@@ -66,4 +66,6 @@ AUTOSTART = NO
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
diff --git a/src/transport/test_transport_ats_4addr.conf b/src/transport/test_transport_ats_4addr.conf
index e82b85bc9..aaa23a515 100644
--- a/src/transport/test_transport_ats_4addr.conf
+++ b/src/transport/test_transport_ats_4addr.conf
@@ -68,4 +68,6 @@ AUTOSTART = NO
[dht]
AUTOSTART = NO
+[mesh]
+AUTOSTART = NO