RECLAIM: refactoring; cleanup

[oweals/gnunet.git] / src / gns / test_gns_defaults.conf

diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf
index 762c9641b455219c8c25365c5e6edd8d8f4302fd..80a2f3c44d4a39998b40641a55a06992a01d61c8 100644 (file)
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -1,75 +1,34 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_defaults.conf
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-testing/
 
-[resolver]
-PORT = 2564
+[namestore-sqlite]
+FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db
 
-[transport]
-PORT = 2565
-PLUGINS = tcp
+[namecache-sqlite]
+FILENAME=$GNUNET_TEST_HOME/namecache/namecache.db
 
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
+[identity]
+# Directory where we store information about our egos
+EGODIR = $GNUNET_TEST_HOME/identity/egos/
 
-[statistics]
-PORT = 2567
+[dhtcache]
+DATABASE = heap
+
+[transport]
+PLUGINS = tcp
 
 [transport-tcp]
-PORT = 2568
 BINDTO = 127.0.0.1
 
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-
-[testing]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-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
-
-[nse]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
 
 [fs]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
-[gns]
-AUTOSTART = NO
+[rps]
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
-[namestore]
-AUTOSTART = NO
\ No newline at end of file
+[topology]
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO