stuff

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

diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf
index bd5f71b29b8d8e8128ce9f5034fc89fe056aa2d8..e3982a1f54f5535f054765b2b7e69f8bf0d393e9 100644 (file)
--- a/src/transport/test_plugin_transport_data_http.conf
+++ b/src/transport/test_plugin_transport_data_http.conf
@@ -1,61 +1,28 @@
+@INLINE@ test_transport_defaults.conf
 [PATHS]
+SERVICEHOME = /tmp/test-transport/plugin_http/
 DEFAULTCONFIG = test_plugin_transport_data_http.conf
-SERVICEHOME = /tmp/test_plugin_transport_http/
 
-[TESTING]
-WEAKRANDOM = YES
+[transport-tcp]
+TIMEOUT = 5000
 
 [transport-http]
-PORT = 12389
+PORT = 12320
 DEBUG = YES
-#USE_IPv4 = NO
-#USE_IPv6 = NO
 USE_IPv6 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-#USE_LOCALADDR = YES
-
 
 [transport-https]
-PORT = 12389
-DEBUG = YES
-#USE_IPv4 = NO
-#USE_IPv6 = NO
-USE_IPv6 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
+PORT = 12321
+CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
 KEY_FILE = https_key.key
 CERT_FILE = https_cert.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
+DEBUG = YES
+USE_IPv6 = YES
 
-[transport]
-PREFIX = valgrind --leak-check=full
-#DEBUG = YES
+[arm]
+PORT = 12323
 
 [statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12367
-
-[arm]
-DEFAULTSERVICES = topology hostlist
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12366
+PORT = 12322
 
-[dht]
-AUTOSTART = NO
 
-[mesh]
-AUTOSTART = NO