X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_api_rel_https_peer2.conf;h=713422a4bb893ca0bb8045357f4200c7ed024bcf;hb=efa03f35a02e6245adfcc6f59e6287a78204a447;hp=ba7a39454bbc8d493573ff22a9f50a372a5c8866;hpb=3e6c37c25b646fbe5dda5ec48959281c88edbaba;p=oweals%2Fgnunet.git

diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf
index ba7a39454..713422a4b 100644
--- a/src/transport/test_transport_api_rel_https_peer2.conf
+++ b/src/transport/test_transport_api_rel_https_peer2.conf
@@ -1,35 +1,17 @@
-[transport-http]
-PORT = 22389
-DEBUG = NO
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-USE_LOCALADDR = YES
-
 [transport-https]
-PORT = 16001
+PORT = 12310
 DEBUG = NO
 USE_IPv4 = YES
 USE_IPv6 = NO
 BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
-KEY_FILE = https_key_p2.key
-CERT_FILE = https_cert_p2.crt
+KEY_FILE = $SERVICEHOME/https_key_p2.key
+CERT_FILE = $SERVICEHOME/https_cert_p2.crt
 CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
 #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
 #CRYPTO_INIT = PERFORMANCE
 USE_LOCALADDR = YES
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -51,7 +33,6 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = https
-#PLUGINS = tcp http
 #DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -60,7 +41,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 16000
+PORT = 12311
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport1 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -75,7 +56,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12312
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -85,7 +66,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12313
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -95,7 +76,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12314
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 
@@ -107,18 +88,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12315
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-
-[transport-http]
-PORT = 22389
-DEBUG = NO
-
-[transport-tcp]
-PORT = 22399
-DEBUG = YES
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -126,8 +98,16 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+SERVICEHOME = /tmp/test-transport/api-https-p2/
+
+[fs]
+AUTOSTART = NO
 
+[datastore]
+AUTOSTART = NO
+
+[core]
+AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO