From 1643c64169883ed1b9c860e3e1146a503f251f0a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 1 Aug 2011 13:43:22 +0000
Subject: simplifying configs

---
 src/core/test_core_api_peer1.conf | 79 +++++----------------------------------
 1 file changed, 9 insertions(+), 70 deletions(-)

(limited to 'src/core/test_core_api_peer1.conf')

diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index 11708be2e..d1ba57a7f 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -1,88 +1,27 @@
+@INLINE@ test_core_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-core-peer-1/
 DEFAULTCONFIG = test_core_api_peer1.conf
 
-[resolver]
-PORT = 12464
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-#PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck
-#PREFIX = valgrind --leak-check=full --log-file=resolver%p
-
-[transport]
-PORT = 12465
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-PLUGINS = tcp
-#PREFIX = xterm -T transport1 -e
-#PREFIX= xterm -e xterm -T transport1 -e gdb --args
-#PREFIX = xterm -T transport1 -e gdb --args
-#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck
-#DEBUG = YES
+[transport-tcp]
+PORT = 12468
 
 [arm]
 PORT = 12466
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-DEFAULTSERVICES = 
-#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
 
 [statistics]
 PORT = 12467
-#PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck
 
-[transport-tcp]
-PORT = 12468
-BINDTO = 127.0.0.1
-#DEBUG = YES
-
-[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
+[resolver]
+PORT = 12464
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12469
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-#PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck
-#PREFIX = xterm -T peerinfo1 -e
-#DEBUG = YES
-
-[core]
-PORT = 12470
-UNIXPATH = /tmp/gnunet-p1-service-core.sock
-#PREFIX = valgrind --tool=memcheck
-#PREFIX = valgrind --tool=callgrind
-#OPTIONS = -l log-core-1
-#PREFIX = xterm -e xterm -T core1 -e gdb --args
-#PREFIX = xterm -T core1 -e 
-#DEBUG = YES
-#BINARY=/home/grothoff/bin/gnunet-service-core
-TOTAL_QUOTA_IN = 655360000
-TOTAL_QUOTA_OUT = 655360000
-
-[testing]
-WEAKRANDOM = YES
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
 
+[transport]
+PORT = 12465
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 
-- 
cgit v1.2.3