X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_api_http_peer2.conf;h=fa7aa3b297d9bb9c0dfdc08ace28a4c8a3b396cb;hb=56389a7d277b05c9c2968b7ebd529a12f8be15eb;hp=15a562b6e1ca47a82b0ec97a2d923491939648d2;hpb=7adcdc82792c48f2331185d9af9d56925978804a;p=oweals%2Fgnunet.git

diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index 15a562b6e..fa7aa3b29 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -1,113 +1,31 @@
-[transport-http]
-PORT = 22368
-DEBUG = YES
-BINDTO = 127.0.0.1
+@INLINE@ template_cfg_peer2.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-http-p2/
+DEFAULTCONFIG = test_transport_api_http_peer2.conf
 
-[fs]
-AUTOSTART = NO
+[transport-http]
+PORT = 12090
 
-[datastore]
-AUTOSTART = NO
+[arm]
+PORT = 12095
+DEFAULTSERVICES = transport
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-[core]
-AUTOSTART = NO
+[statistics]
+PORT = 12094
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
+[resolver]
+PORT = 12093
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
+[peerinfo]
+PORT = 12092
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [transport]
+#DEBUG = YES
+PORT = 12091
 PLUGINS = http
-#PLUGINS = tcp http
-DEBUG = NO
-# PREFIX = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22365
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-#PREFIX = xterm -T transport1 -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]
-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 = 
-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
-
-
-[transport-http]
-PORT = 22389
-DEBUG = NO
-
-[transport-tcp]
-PORT = 22399
-DEBUG = YES
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-DEFAULTCONFIG = test_transport_api_http_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
-