guix-env: some update.

[oweals/gnunet.git] / src / testbed / test_testbed_api_template.conf

diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf
index f08cb5b9acf83c6dbc047a5fb5ec5fcd0bf40ff8..48926389bb417e53282be2dd6c9504aa61e9b172 100644 (file)
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.conf
@@ -1,3 +1,6 @@
+@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
+
 [testbed]
 AUTOSTART = NO
 PORT = 12113
@@ -6,18 +9,6 @@ HOSTNAME = localhost
 OVERLAY_TOPOLOGY = NONE
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
@@ -27,54 +18,28 @@ PLUGINS = udp
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-PORT = 12365
+FORCESTART = YES
+
+# Transport requires resolver when connecting to a peer, so enable it
+[resolver]
+AUTOSTART = YES
 
 [ats]
 WAN_QUOTA_OUT = 3932160
 WAN_QUOTA_IN = 3932160
 
 [core]
-PORT = 12092
-AUTOSTART = YES
 USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
+FORCESTART = YES
 
 [transport-udp]
 TIMEOUT = 300 s
-PORT = 12368
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-testbed/
 
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
 
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = NO
-
 [peerinfo]
 NO_IO = YES