projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- use tunnel encryption state to select decryption key
[oweals/gnunet.git]
/
src
/
testbed
/
testbed.conf.in
diff --git
a/src/testbed/testbed.conf.in
b/src/testbed/testbed.conf.in
index dcd8829a1efc569babf38ce6a9ddc9a193995536..79334c4cd49191461015970dd66030caaea22581 100644
(file)
--- a/
src/testbed/testbed.conf.in
+++ b/
src/testbed/testbed.conf.in
@@
-1,8
+1,7
@@
[testbed]
AUTOSTART = NO
[testbed]
AUTOSTART = NO
-@
UNIXONLY
@ PORT = 2101
+@
JAVAPORT
@ PORT = 2101
HOSTNAME = localhost
HOSTNAME = localhost
-HOME = $SERVICEHOME
BINARY = gnunet-service-testbed
# How long should operations wait?
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;
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
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
@@
-88,7
+87,16
@@
AUTOSTART = NO
@UNIXONLY@ PORT = 2102
HOSTNAME = localhost
BINARY = gnunet-service-testbed-logger
@UNIXONLY@ PORT = 2102
HOSTNAME = localhost
BINARY = gnunet-service-testbed-logger
-UNIXPATH =
/tmp
/gnunet-gnunet-testbed-logger.sock
+UNIXPATH =
$GNUNET_RUNTIME_DIR
/gnunet-gnunet-testbed-logger.sock
DIR = /tmp
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
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