-autostarts

diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf
index bdba91731a02103b8e44aabf1f64759d344f1386..113d6bb93c08e1e2866160dc0c91967b62a27602 100644 (file)
--- 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 e32213bc33f976e06b5c0478c7b05bbf49605379..2bc3d2686621c15e47eb92a96005ab4874ae40ed 100644 (file)
--- 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 b74a6a615dbf16ab3cc9cfd492acff9c97ad73ab..5772250f6ca08b42b7b7c7ce64efb6d05070049f 100644 (file)
--- 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 342cd41c079c7c535ce54746fa3de0fa4f8d9df7..964cceb275120dbc874a87738ab6e799d3b5e42e 100644 (file)
--- 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 b7e68ff8553fcf47afb0dbb607bedcfa6addc400..7b6c4c42dfc887c53976300065a875473258c94f 100644 (file)
--- 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 59700c343785a24e77e018dfcd79eb34ea3c997d..ba05e9357bef4a6f9be0c9965e75cb9b616139fa 100644 (file)
--- 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 cc969376e744050f638355d785f88acf5b73a7b1..0a0e74af951404e5657b9c3ede3bcac8e0de2e13 100644 (file)
--- 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 72e62746fac7e291f64ec605dea154a52edda454..f55337713aa90e897acd569d543dfab19403d6b9 100644 (file)
--- 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