guix-env: some update.

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

diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 8c2af036b0c5a24388ecc611a40cbd8103f46ebf..86044fbfb5ba41886e3d836acf4c581924768242 100644 (file)
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -31,7 +31,7 @@ MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 1
 # What topology should be generated by the helper functions GNUNET_TESTBED_run()
 # and GNUNET_TESTBED_test_run().  This option has no effect if testbed is
 # initialized with other functions.  Valid values can be found at:
-# https://gnunet.org/content/supported-topologies
+# https://gnunet.org/supported-topologies
 OVERLAY_TOPOLOGY = NONE
 
 # Number of random links to be included to the generate the above topology.
@@ -42,9 +42,16 @@ OVERLAY_TOPOLOGY = NONE
 # This option is required if the OVERLAY_TOPOLOGY is set to FROM_FILE.  It is
 # ignored for all other topologies.  This option should contain the path to
 # the file containing the topology information.  The format of the file is
-# presented at: https://gnunet.org/content/topology-file-format
+# presented at: https://gnunet.org/topology-file-format
 # OVERLAY_TOPOLOGY_FILE = /path/to/topology-file
 
+# The following options are required if the OVERLAY_TOPOLOGY is set to
+# SCALE_FREE.  They are ignored in all other cases.
+# The number of maximum peers which can connect to a peer
+SCALE_FREE_TOPOLOGY_CAP = 70
+# The minimum number of peers which a peer has to connect
+SCALE_FREE_TOPOLOGY_M = 5
+
 # How many maximum number of handles to peers' services should be kept open at
 # any time.  This number also keeps a check on the number of open descriptors as
 # opening a service connection results in opening a file descriptor.
@@ -65,7 +72,7 @@ SETUP_TIMEOUT = 5 m
 # Where should testbed write load statistics data
 # STATS_DIR = /tmp/load
 
-# What services should be shared among peers.  
+# What services should be shared among peers.
 # Format is "[<service:share>] [<service:share>] ...".  The shared services are
 # started standalone without any other peer services or a hostkey.  For this
 # reason, only services which doesn't depend on other services can only be
@@ -82,17 +89,6 @@ SETUP_TIMEOUT = 5 m
 SHARED_SERVICES =
 
 
-[testbed-logger]
-AUTOSTART = NO
-@UNIXONLY@ PORT = 2102
-HOSTNAME = localhost
-BINARY = gnunet-service-testbed-logger
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gnunet-testbed-logger.sock
-DIR = /tmp
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-
 [testbed-barrier]
 AUTOSTART = NO
 @UNIXONLY@ PORT = 2103
@@ -106,13 +102,15 @@ UNIX_MATCH_GID = YES
 # connectivity restrictions of NAT boxes
 [testbed-underlay]
 AUTOSTART = NO
+NOARMBIND = YES
 BINARY = gnunet-daemon-testbed-underlay
 # The sqlite3 database file containing information about what underlay
 # restrictions to apply
-# DBFILE = 
+# DBFILE =
 
 [latency-logger]
 AUTOSTART = NO
+NOARMBIND = YES
 BINARY = gnunet-daemon-latency-logger
 # The sqlite3 database file where the latency values are to be stored
-# DBFILE = 
\ No newline at end of file
+# DBFILE =
\ No newline at end of file