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_peer2.conf | 76 ++++++---------------------------------
 1 file changed, 10 insertions(+), 66 deletions(-)

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

diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index 7d8178287..4e5071251 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -1,88 +1,32 @@
+@INLINE@ test_core_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-core-peer-2/
 DEFAULTCONFIG = test_core_api_peer2.conf
 
-[resolver]
-PORT = 22464
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-#PREFIX = xterm -T resolver2 -e valgrind --tool=memcheck
-#PREFIX = xterm -e xterm -T resolver2 -e gdb --args
-#PREFIX = valgrind --leak-check=full --log-file=resolver%p
-
-[transport]
-PORT = 22465
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-PLUGINS = tcp
-#PREFIX = xterm -T transport2 -e gdb --args
-#PREFIX = xterm -e xterm -T transport2 -e gdb --args
-#PREFIX = xterm -T transport2 -e
-#PREFIX = xterm -T transport2 -e valgrind --tool=memcheck
-#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
+[transport-tcp]
+PORT = 22468
 
 [arm]
 PORT = 22466
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-DEFAULTSERVICES = 
-#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
 
 [statistics]
 PORT = 22467
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-#PREFIX = xterm -T statistics2 -e valgrind --tool=memcheck
 
-[transport-tcp]
-PORT = 22468
-BINDTO = 127.0.0.1
-#DEBUG = YES
+[resolver]
+PORT = 22464
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 22469
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-#PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck
-#PREFIX = xterm -T peerinfo2 -e 
-#DEBUG = YES
+
+[transport]
+PORT = 22465
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 
 [core]
 PORT = 22470
 UNIXPATH = /tmp/gnunet-p2-service-core.sock
-#PREFIX = xterm -T core2 -e
-#PREFIX = valgrind --tool=memcheck
-#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
-
 
-- 
cgit v1.2.3