Moving regex profiler config to contrib

[oweals/gnunet.git] / src / mesh / test_mesh_2dtorus.conf

diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf
index 5d91a8b43981b992070688950a2f18478204579c..5dea5de808f7626140ab8f7e8077cb428387758e 100644 (file)
--- a/src/mesh/test_mesh_2dtorus.conf
+++ b/src/mesh/test_mesh_2dtorus.conf
@@ -1,18 +1,15 @@
 [PATHS]
 SERVICEHOME = /tmp/test_mesh_small/
-DEFAULTCONFIG = test_mesh_small.conf
 
 [arm]
 PORT = 10010
 DEFAULTSERVICES = core dht mesh
-#DEBUG = YES
 
 [statistics]
 AUTOSTART = YES
 PORT = 10000
 
 [dht]
-DEBUG = NO
 AUTOSTART = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -39,6 +36,7 @@ ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 RETURN_LOCAL_ADDRESSES = YES
+USE_LOCALADDR = YES
 
 [ats]
 WAN_QUOTA_IN = 1 GB
@@ -54,12 +52,15 @@ PORT = 10004
 
 [mesh]
 PORT = 10005
-DEBUG=YES
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 # PREFIX = valgrind --leak-check=full
 # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
+[vpn]
+AUTOSTART = NO
+PORT = 10012
+
 [testing]
 WEAKRANDOM = YES
 
@@ -68,7 +69,6 @@ NUM_PEERS = 16
 TOPOLOGY = 2D_TORUS
 CONNECT_TOPOLOGY = 2D_TORUS
 #TOPOLOGY_FILE = small.dat
-CONNECT_TOPOLOGY = 2D_TORUS
 #CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
 #CONNECT_TOPOLOGY_OPTION_MODIFIER = 25
 #PERCENTAGE = 3
@@ -76,8 +76,7 @@ CONNECT_TOPOLOGY = 2D_TORUS
 F2F = NO
 CONNECT_TIMEOUT = 600 s
 CONNECT_ATTEMPTS = 2
-DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s