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/testing/test_testing_defaults.conf       | 57 ---------------------------
 src/testing/test_testing_sharedservices.conf | 58 ----------------------------
 2 files changed, 115 deletions(-)

(limited to 'src/testing')

diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 7a174b9dd..ec0334c05 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -1,36 +1,15 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-testing/
 
-[resolver]
-PORT = 2564
-
 [transport]
-PORT = 2565
 PLUGINS = tcp
 
 [transport-tcp]
 TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM;
 
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
 [transport-tcp]
-PORT = 2568
 BINDTO = 127.0.0.1
 
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-
-[dht]
-AUTOSTART = NO
-
 [nat]
 DISABLEV6 = YES
 ENABLE_UPNP = NO
@@ -40,39 +19,3 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
diff --git a/src/testing/test_testing_sharedservices.conf b/src/testing/test_testing_sharedservices.conf
index b8408774f..e1830edd2 100644
--- a/src/testing/test_testing_sharedservices.conf
+++ b/src/testing/test_testing_sharedservices.conf
@@ -6,37 +6,15 @@ PORT = 15000
 UNIXPATH = $GNUNET_RUNTIME_DIR/testbed-logger.sock
 DIR = /tmp/testbed-logger
 
-[resolver]
-PORT = 2564
-
 [transport]
-PORT = 2565
 PLUGINS = tcp
 
 [transport-tcp]
 TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM;
 
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
 [transport-tcp]
-PORT = 2568
 BINDTO = 127.0.0.1
 
-[peerinfo]
-PORT = 2569
-AUTOSTART = NO
-
-[core]
-PORT = 2570
-
-[dht]
-AUTOSTART = NO
-
 [nat]
 DISABLEV6 = YES
 ENABLE_UPNP = NO
@@ -46,39 +24,3 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-- 
cgit v1.2.3