Merge branch 'master' of ssh://gnunet.org/gnunet

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

diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index 0d22f9c780001cf6520bd56e907c44c59a331d53..59ac327d561e4b9b0911727af3bb89bb4d123ac9 100644 (file)
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -1,36 +1,31 @@
-@INLINE@ test_transport_defaults.conf
+@INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
 
-[transport-https]
+[transport-https_server]
 PORT = 3001
-CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
 KEY_FILE = https_key_quota_p2.key
 CERT_FILE = https_cert_qutoa_p2.crt
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 3006
-UNIXPATH = /tmp/test_quota_compliance_https_arm_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer2.sock
 
 [statistics]
 PORT = 3005
-UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer2.sock
 
 [resolver]
 PORT = 3004
-UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer2.sock
 
 [peerinfo]
 PORT = 3003
-UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer2.sock
 
 [transport]
 PORT = 3002
-PLUGINS = https
-UNIXPATH = /tmp/https_transport_peer2.sock
+PLUGINS = https_server
+UNIXPATH = $GNUNET_RUNTIME_DIR/https_transport_peer2.sock