1 files changed, 9 insertions, 9 deletions
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf
index d0b9e7272..d3298bdc7 100644
--- a/src/transport/test_transport_api_rel_https_peer1.conf
+++ b/src/transport/test_transport_api_rel_https_peer1.conf
@@ -1,12 +1,12 @@
 [transport-https]
-PORT = 13301
+PORT = 12300
 USE_IPv4 = YES
 USE_IPv6 = NO
 BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
 USE_LOCALADDR = YES
-KEY_FILE = https_key_p1.key
+KEY_FILE = $SERVICEHOME/https_key_p1.key
-CERT_FILE = https_cert_p1.crt
+CERT_FILE = $SERVICEHOME/https_cert_p1.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
@@ -40,7 +40,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13302
+PORT = 12301
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -55,7 +55,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13303
+PORT = 12302
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 [resolver]
@@ -65,7 +65,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13304
+PORT = 12303
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 [statistics]
@@ -75,7 +75,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13305
+PORT = 12304
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 [arm]
@@ -86,7 +86,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13306
+PORT = 12305
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 [TESTING]
@@ -96,7 +96,7 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-https-p1/
 [fs]
 AUTOSTART = NO

diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf index d0b9e7272..d3298bdc7 100644 --- a/src/transport/test_transport_api_rel_https_peer1.conf +++ b/src/transport/test_transport_api_rel_https_peer1.conf
@@ -1,12 +1,12 @@
1	[transport-https]	1	[transport-https]
2	PORT = 13301	2	PORT = 12300
3	USE_IPv4 = YES	3	USE_IPv4 = YES
4	USE_IPv6 = NO	4	USE_IPv6 = NO
5	BINDTO4 = 127.0.0.1	5	BINDTO4 = 127.0.0.1
6	#BINDTO6 = ::1	6	#BINDTO6 = ::1
7	USE_LOCALADDR = YES	7	USE_LOCALADDR = YES
8	KEY_FILE = https_key_p1.key	8	KEY_FILE = $SERVICEHOME/https_key_p1.key
9	CERT_FILE = https_cert_p1.crt	9	CERT_FILE = $SERVICEHOME/https_cert_p1.crt
10	CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL	10	CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
11	#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL	11	#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
12	#CRYPTO_INIT = PERFORMANCE	12	#CRYPTO_INIT = PERFORMANCE
@@ -40,7 +40,7 @@ BINARY = gnunet-service-transport
40	CONFIG = $DEFAULTCONFIG	40	CONFIG = $DEFAULTCONFIG
41	HOME = $SERVICEHOME	41	HOME = $SERVICEHOME
42	HOSTNAME = localhost	42	HOSTNAME = localhost
43	PORT = 13302	43	PORT = 12301
44	UNIXPATH = /tmp/gnunet-p1-service-transport.sock	44	UNIXPATH = /tmp/gnunet-p1-service-transport.sock
45	#PREFIX = xterm -T transport2 -e gdb --command=cmd --args	45	#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
46	#PREFIX = valgrind --leak-check=full	46	#PREFIX = valgrind --leak-check=full
@@ -55,7 +55,7 @@ BINARY = gnunet-service-peerinfo
55	CONFIG = $DEFAULTCONFIG	55	CONFIG = $DEFAULTCONFIG
56	HOME = $SERVICEHOME	56	HOME = $SERVICEHOME
57	HOSTNAME = localhost	57	HOSTNAME = localhost
58	PORT = 13303	58	PORT = 12302
59	UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock	59	UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
60		60
61	[resolver]	61	[resolver]
@@ -65,7 +65,7 @@ BINARY = gnunet-service-resolver
65	CONFIG = $DEFAULTCONFIG	65	CONFIG = $DEFAULTCONFIG
66	HOME = $SERVICEHOME	66	HOME = $SERVICEHOME
67	HOSTNAME = localhost	67	HOSTNAME = localhost
68	PORT = 13304	68	PORT = 12303
69	UNIXPATH = /tmp/gnunet-p1-service-resolver.sock	69	UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
70		70
71	[statistics]	71	[statistics]
@@ -75,7 +75,7 @@ BINARY = gnunet-service-statistics
75	CONFIG = $DEFAULTCONFIG	75	CONFIG = $DEFAULTCONFIG
76	HOME = $SERVICEHOME	76	HOME = $SERVICEHOME
77	HOSTNAME = localhost	77	HOSTNAME = localhost
78	PORT = 13305	78	PORT = 12304
79	UNIXPATH = /tmp/gnunet-p1-service-statistics.sock	79	UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
80		80
81	[arm]	81	[arm]
@@ -86,7 +86,7 @@ BINARY = gnunet-service-arm
86	CONFIG = $DEFAULTCONFIG	86	CONFIG = $DEFAULTCONFIG
87	HOME = $SERVICEHOME	87	HOME = $SERVICEHOME
88	HOSTNAME = localhost	88	HOSTNAME = localhost
89	PORT = 13306	89	PORT = 12305
90	UNIXPATH = /tmp/gnunet-p1-service-arm.sock	90	UNIXPATH = /tmp/gnunet-p1-service-arm.sock
91		91
92	[TESTING]	92	[TESTING]
@@ -96,7 +96,7 @@ WEAKRANDOM = YES
96	HOSTKEY = $SERVICEHOME/.hostkey	96	HOSTKEY = $SERVICEHOME/.hostkey
97		97
98	[PATHS]	98	[PATHS]
99	SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/	99	SERVICEHOME = /tmp/test-transport/api-https-p1/
100		100
101	[fs]	101	[fs]
102	AUTOSTART = NO	102	AUTOSTART = NO