-simplify configs

diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf
index f24f1faa9442fbcbf1b9c765e26aaec29477b9d6..2652b98a329e48053ba4981a39f34beac562449f 100644 (file)
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -1,47 +1,15 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
+SERVICEHOME = /tmp/test-gnunet-gns-testing/
 
-[resolver]
-PORT = 2564
+[dhtcache]
+DATABASE = heap
 
 [transport]
-PORT = 2565
 PLUGINS = tcp
 
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
 [transport-tcp]
-PORT = 2568
 BINDTO = 127.0.0.1
 
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-
-[testing]
-NUM_PEERS = 5
-F2F = YES
-HOSTKEYSFILE = ${DATADIR}/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
 
@@ -60,9 +28,6 @@ AUTOSTART = NO
 [dv]
 AUTOSTART = NO
 
-[chat]
-AUTOSTART = NO
-
 [vpn]
 AUTOSTART = NO
 

diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index cdb6bace3a2e9f306d98f01da1258869b7578104..86c6fc1f8b90668522f75a841f6612aaf41a3d83 100644 (file)
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -1,97 +1,21 @@
 @INLINE@ test_gns_defaults.conf
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = YES
-HOSTNAME = localhost
-
 [dht]
 AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 12100
-BINARY = gnunet-service-dht
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
 
 [transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_IN = 1 GB
-WAN_QUOTA_OUT = 1 GB
-
-[core]
-PORT = 12092
+PLUGINS =
 
 [arm]
-DEFAULTSERVICES = core dht namestore
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-BINDTO = 127.0.0.1
+DEFAULTSERVICES = 
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
-
-
-[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 = YES
-DNS_EXIT = 8.8.8.8
+SERVICEHOME = /tmp/test-gnunet-gns-peer-1/
 
 [gns]
-#PREFIX = valgrind --leak-check=full --track-origins=yes 
+PREFIX = valgrind --leak-check=full --track-origins=yes 
 AUTOSTART = YES
-BINARY = gnunet-service-gns
-HIJACK_DNS = NO
-UNIXPATH = /tmp/gnunet-service-gns.sock
-HOME = $SERVICEHOME
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s
 RECORD_PUT_INTERVAL = 1 h
 
-[nse]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = NO
-
-[namestore]
-PORT = 22371
-AUTOSTART = YES
-UNIXPATH = /tmp/gnunet-service-namestore-default.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-namestore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DATABASE = sqlite
-ZONEFILE_DIRECTORY = $SERVICEHOME
-
-[identity]
-EGODIR = egos/
-
-[namestore-sqlite]
-FILENAME = $SERVICEHOME/sqlite-default.db