simplifying config

1 files changed, 17 insertions, 109 deletions

diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index a27e8ccf9..0d22f9c78 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -1,128 +1,36 @@
+@INLINE@ test_transport_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
 
 [transport-https]
 PORT = 3001
-#DEBUG = YES
+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
-#BINDTO6 = ::1
-KEY_FILE = https_key_quota_p2.key
-CERT_FILE = https_cert_qutoa_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
-
-[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]
-PORT = 3002
-UNIXPATH = /tmp/https_transport_peer2.sock
-plugins = https
-#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
-
-
-[peerinfo]
-PORT = 3003
-UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock
-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
-
-[resolver]
-PORT = 3004
-UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-
-[statistics]
-PORT = 3005
-UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-
 
 [arm]
 PORT = 3006
 UNIXPATH = /tmp/test_quota_compliance_https_arm_peer2.sock
-DEFAULTSERVICES = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-
 
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
+[statistics]
+PORT = 3005
+UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock
 
+[resolver]
+PORT = 3004
+UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock
 
+[peerinfo]
+PORT = 3003
+UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock
 
-[nse]
-AUTOSTART = NO
+[transport]
+PORT = 3002
+PLUGINS = https
+UNIXPATH = /tmp/https_transport_peer2.sock