From afb3ea4f771c7534dbee439c21a62fe0519ba832 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 2 Aug 2011 07:46:21 +0000
Subject: towards simplified configs

---
 src/testing/test_testing_data_topology_ring.conf | 59 ++++--------------------
 1 file changed, 8 insertions(+), 51 deletions(-)

(limited to 'src/testing/test_testing_data_topology_ring.conf')

diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf
index c0632b84a..3bd0c956b 100644
--- a/src/testing/test_testing_data_topology_ring.conf
+++ b/src/testing/test_testing_data_topology_ring.conf
@@ -1,59 +1,16 @@
+@INLINE@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-#DEBUG = YES
-
-[testing]
-NUM_PEERS = 5
-WEAKRANDOM = YES
+[TESTING]
 TOPOLOGY = RING
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[dht]
-AUTOSTART = NO
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
-AUTOSTART = NO
-
 
+[datastore]
+AUTOSTART = YES
 
-[nse]
-AUTOSTART = NO
+[fs]
+AUTOSTART = YES
 
+[mesh]
+AUTOSTART = YES
 
-- 
cgit v1.2.3