X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_quota_compliance_http_peer2.conf;h=33f8be543aa32d45eeeace723ae87f2801c53621;hb=1947bc8ef4eb37738ffc1c566d9c6f96071b29f7;hp=b69e772005a0459987288d2e2491fe163366df32;hpb=3c96ac35df35d267713bd89a0bc9cd8df99215bc;p=oweals%2Fgnunet.git

diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index b69e77200..33f8be543 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -1,117 +1,32 @@
+@INLINE@ template_cfg_peer2.conf
 [PATHS]
 SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
 
-[transport-http]
-PORT = 3389
-DEBUG = NO
-USE_IPv4 = YES
+[transport-http_server]
+PORT = 3010
 USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-
-
-[transport-udp]
-PORT = 3094
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 3094
 BINDTO = 127.0.0.1
 
-[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
-
-[core]
-AUTOSTART = NO
-
-[transport]
-plugins = http
-#DEBUG = YES
-PREFIX = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 3091
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_transport_peer2.sock
-
-[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 = 3090
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_peerinfo_peer2.sock
-
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 3089
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_resolver_peer2.sock
-
-[statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 3088
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_statistics_peer2.sock
 
 [arm]
-DEFAULTSERVICES = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 3087
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_arm_peer2.sock
+PORT = 3015
+UNIXPATH = /tmp/test_quota_compliance_http_arm_peer2.sock
 
-[TESTING]
-WEAKRANDOM = YES
+[statistics]
+PORT = 3014
+UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer2.sock
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+[resolver]
+PORT = 3013
+UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer2.sock
 
+[peerinfo]
+PORT = 3012
+UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock
 
-[dht]
-AUTOSTART = NO
+[transport]
+PORT = 3011
+PLUGINS = http_server
+UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock