X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Ftestbed.conf.in;h=79334c4cd49191461015970dd66030caaea22581;hb=27c12911f4f2aba2d90099270d70de846e83854f;hp=9dc269e5c3728ad9c31010962d4c3dd9fa5d0575;hpb=ff1c4e766d43c2343a7204918840b953329787d7;p=oweals%2Fgnunet.git

diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 9dc269e5c..79334c4cd 100644
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -1,8 +1,7 @@
 [testbed]
 AUTOSTART = NO
-@UNIXONLY@ PORT = 2101
+@JAVAPORT@ PORT = 2101
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-testbed
 
 # How long should operations wait?
@@ -19,7 +18,7 @@ OPERATION_TIMEOUT = 30 s
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 
-UNIXPATH = /tmp/gnunet-service-testbed.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
@@ -29,6 +28,23 @@ UNIX_MATCH_GID = YES
 MAX_PARALLEL_OPERATIONS = 1000
 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
+OVERLAY_TOPOLOGY = NONE
+
+# Number of random links to be included to the generate the above topology.
+# Note that not all topologies require this option and ignore it.  Topologies
+# requiring this option are RANDOM, SMALL_WORLD and SMALL_WORLD ring.
+# OVERLAY_RANDOM_LINKS =
+
+# If the OVERLAY_TOPOLOGY is set to FROM_FILE.  This option is ignored for all
+# other topology values.  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
+# OVERLAY_TOPOLOGY_FILE = /path/to/topology-file
+
 # 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.
@@ -47,4 +63,40 @@ MAX_OPEN_FDS = 512
 SETUP_TIMEOUT = 5 m
 
 # Where should testbed write load statistics data
-# STATS_DIR = /tmp/load
\ No newline at end of file
+# STATS_DIR = /tmp/load
+
+# 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
+# shared.  Example: To share peerinfo among every 10 peers.  The following spec
+# will start 5 peerinfo services when 50 peers are started:
+#
+#   SHARED_SERVICES = peerinfo:10
+#
+# To share multiple services
+#
+#   SHARED_SERVICES = service1:n_share1 service2:n_share2 ...
+#
+# Default is to share no services
+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
+HOSTNAME = localhost
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES