use defaults

git-svn-id: https://gnunet.org/svn/gnunet@12310 140774ce-b5e7-0310-ab8b-a85725594a96

5 files changed, 6 insertions, 171 deletions

diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 44d736aef6..df2c53d2a2 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -3,44 +3,15 @@ SERVICEHOME = /tmp/test-dht-api/
 DEFAULTCONFIG = test_dht_api_data.conf
 
 [fs]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-fs
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2094
-INDEXDB = $SERVICEHOME/idxinfo.lst
+AUTOSTART = NO
 
 [datastore-sqlite]
 FILENAME = $SERVICEHOME/datastore/sqlite.db
 
 [datastore]
-DATABASE = sqlite
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-QUOTA = 100000000
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-datastore
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2093
-
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
+AUTOSTART = NO
 
 [topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
 TARGET-CONNECTION-COUNT = 16
 AUTOCONNECT = YES
 FRIENDS-ONLY = NO
@@ -49,74 +20,29 @@ MINIMUM-FRIENDS = 0
 [core]
 TOTAL_QUOTA_OUT = 3932160
 TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 2092
 
 [dht]
 DEBUG = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-dht
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12370
 
 [transport]
 plugins = tcp
 DEBUG = NO
-PREFIX = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 2091
 
 [peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 2090
 
 [resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 2089
 
 [statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 2088
 
 [arm]
 DEFAULTSERVICES = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 2087
 
 [transport-tcp]
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index d816424d64..013c15ac68 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -1,21 +1,11 @@
 [fs]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-fs
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2094
-INDEXDB = $SERVICEHOME/idxinfo.lst
+AUTOSTART = NO
 
 [dht]
 DEBUG = NO
 AUTOSTART = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-dht
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 2100
 
@@ -29,31 +19,15 @@ DEBUG = NO
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12365
 
 [core]
 TOTAL_QUOTA_OUT = 3932160
 TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12092
 
 [arm]
 DEFAULTSERVICES = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12366
 DEBUG = YES
 
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index b8458c4312..f9283ee894 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -1,12 +1,5 @@
 [fs]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-fs
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2094
-INDEXDB = $SERVICEHOME/idxinfo.lst
+AUTOSTART = NO
 
 [dht]
 DEBUG = YES
@@ -14,7 +7,6 @@ STOP_ON_CLOSEST = YES
 AUTOSTART = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-dht
 #PREFIX = xterm -T dht -e gdb --args
 #PREFIX = valgrind --log-file=dht_%p
 CONFIG = $DEFAULTCONFIG
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index a4e8be65ea..90f8a0b652 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -1,25 +1,10 @@
 [fs]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-fs
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2094
-INDEXDB = $SERVICEHOME/idxinfo.lst
+AUTOSTART = NO
 
 [dht]
 DEBUG = YES
 AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-dht
-#BINARY = gnunet-service-dht-new
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dht/.libs/gnunet-service-dht-new
 #PREFIX = xterm -T dht -e gdb --args
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 2100
 DISABLE_SOCKET_FORWARDING = YES
 
@@ -30,34 +15,17 @@ DATABASE = sqlite
 [transport]
 PLUGINS = tcp
 DEBUG = NO
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12365
 
 [core]
 TOTAL_QUOTA_OUT = 3932160
 TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 12092
 
 [arm]
 DEFAULTSERVICES = core dht
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12366
 DEBUG = YES
 
diff --git a/src/dht/test_dhtlog_data.conf b/src/dht/test_dhtlog_data.conf
index 391f90f86a..d2a497f43b 100644
--- a/src/dht/test_dhtlog_data.conf
+++ b/src/dht/test_dhtlog_data.conf
@@ -1,12 +1,5 @@
 [fs]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-fs
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2094
-INDEXDB = $SERVICEHOME/idxinfo.lst
+AUTOSTART = NO
 
 [dhtcache]
 QUOTA = 1000000
@@ -15,34 +8,16 @@ DATABASE = sqlite
 [transport]
 PLUGINS = tcp
 DEBUG = NO
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12365
 
 [core]
 TOTAL_QUOTA_OUT = 3932160
 TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12092
 
 [arm]
 DEFAULTSERVICES = core dht
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12366
 DEBUG = NO