REST/NAMESTORE: rework API

[oweals/gnunet.git] / src / transport / test_transport_api_multi_peer2.conf

diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index d9ace0a8f3426a542b7af581f0ba62b6173b8d56..f69e0abd977a777d5858eb7b3dc562bb1328c80b 100644 (file)
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,134 +1,9 @@
-[transport-tcp]
-DISABLEV6 = YES
-PORT = 0
-BINDTO = 127.0.0.1
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-ENABLE_UPNP = NO
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-
-[transport-udp]
-PORT = 40001
-
-[transport-http]
-PORT = 40002
-DEBUG = NO
-USE_IPv6 = YES
-USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-
-[transport-https]
-PORT = 40003
-DEBUG = NO
-USE_IPv6 = YES
-USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-
-
-[core]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[transport]
-PLUGINS = tcp udp http
-#DEBUG = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22365
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-#PREFIX = valgrind --tool=callgrind
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full
-
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22369
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22364
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-
-[statistics]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22367
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-
-[arm]
-DEFAULTSERVICES = transport
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22366
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
+@INLINE@ template_cfg_peer2.conf
 [PATHS]
-DEFAULTCONFIG = test_transport_api_multi_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-2/
-
-
-[dht]
-AUTOSTART = NO
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-multi-p2/
 
+[nat]
+ALLOW_NAT = NO
 
+[transport]
+PLUGINS = tcp udp