-autostarts

8 files changed, 39 insertions, 20 deletions

diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf
index bdba91731..113d6bb93 100644
--- a/src/datastore/test_defaults.conf
+++ b/src/datastore/test_defaults.conf
@@ -19,3 +19,12 @@ AUTOSTART = NO
 
 [chat]
 AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[dv]
+AUTOSTART = NO
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index e32213bc3..2bc3d2686 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -79,3 +79,9 @@ AUTOSTART = NO
 
 [chat]
 AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index b74a6a615..5772250f6 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -54,3 +54,9 @@ AUTOSTART = NO
 
 [chat]
 AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 342cd41c0..964cceb27 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -80,34 +80,28 @@ PORT = 0
 AUTOSTART = NO
 
 [topology]
-PORT = 0
 AUTOSTART = NO
 
 [dv]
-PORT = 0
 AUTOSTART = NO
 
 [resolver]
 PORT = 0
 
-[gnunet-nat-server]
-PORT = 0
-
 [ats]
 PORT = 0
 
 [mesh]
-PORT = 0
+AUTOSTART = NO
 
-[template]
-PORT = 0
+[chat]
+AUTOSTART = NO
 
-#@W32PORT@ PORT = 1234
-#@UNIXONLY@ PORT = 0
+[gns]
+AUTOSTART = NO
 
-[chat]
+[vpn]
 AUTOSTART = NO
-PORT = 0
 
 [testing]
 NUM_PEERS = 4000
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index b7e68ff85..7b6c4c42d 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -67,3 +67,6 @@ AUTOSTART = NO
 
 [vpn]
 AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index 59700c343..ba05e9357 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -47,8 +47,4 @@ WAN_QUOTA_OUT = 1 GB
 PORT = 12006
 UNIXPATH = /tmp/gnunet-p1-service-ats.sock
 
-[vpn]
-UNIXPATH = /tmp/gnunet-p1-service-vpn.sock
 
-[chat]
-AUTOSTART = NO
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index cc969376e..0a0e74af9 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -47,8 +47,4 @@ WAN_QUOTA_OUT = 1 GB
 PORT = 12016
 UNIXPATH = /tmp/gnunet-p2-service-ats.sock
 
-[vpn]
-UNIXPATH = /tmp/gnunet-p2-service-vpn.sock
 
-[chat]
-AUTOSTART = NO
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
index 72e62746f..f55337713 100644
--- a/src/transport/test_transport_defaults.conf
+++ b/src/transport/test_transport_defaults.conf
@@ -35,6 +35,15 @@ AUTOSTART = NO
 [dv]
 AUTOSTART = NO
 
+[gns]
+AUTOSTART = NO
+
+[chat]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
 [nat]
 DISABLEV6 = YES
 BINDTO = 127.0.0.1