From b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 10 Dec 2014 17:11:06 +0000
Subject: moving away from DEFAULTSERVICES to per-section FORCESTART, thus
 addressing #3565 indirectly

---
 src/topology/test_gnunet_daemon_topology_data.conf | 45 ----------------------
 src/topology/topology.conf                         |  1 +
 2 files changed, 1 insertion(+), 45 deletions(-)

(limited to 'src/topology')

diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index 79f12e5e1..a413ab72c 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -1,27 +1,15 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-topology/
 
-[resolver]
-PORT = 2664
-
 [transport]
-PORT = 2665
 PLUGINS = tcp
 #PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
 #PREFIX = valgrind --tool=memcheck --log-file=logs%p
 
-[arm]
-PORT = 2666
-DEFAULTSERVICES = topology
-
 [testbed]
 OVERLAY_TOPOLOGY=LINE
 
-[statistics]
-PORT = 2667
-
 [transport-tcp]
-PORT = 2668
 BINDTO = 127.0.0.1
 
 [nat]
@@ -34,36 +22,3 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 USE_HOSTNAME = NO
 
-[peerinfo]
-PORT = 2669
-
-[core]
-PORT = 2670
-
-[topology]
-#PREFIX = valgrind --tool=memcheck
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[testing]
-WEAKRANDOM = YES
-
-[testing_old]
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
diff --git a/src/topology/topology.conf b/src/topology/topology.conf
index 5e72d57ce..79dd52347 100644
--- a/src/topology/topology.conf
+++ b/src/topology/topology.conf
@@ -1,4 +1,5 @@
 [topology]
+FORCESTART = YES
 MINIMUM-FRIENDS = 0
 FRIENDS-ONLY = NO
 TARGET-CONNECTION-COUNT = 16
-- 
cgit v1.2.3