rename GNUNET_GETOPT functions to achieve better consistency

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

diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index 3b861370f50787bbbe2346de30b7e449e05791d8..8df39d48846dc16a75e36a66cc37c93832ae5bc9 100644 (file)
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -1,10 +1,8 @@
 @INLINE@ test_transport_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = template_cfg_peer2.conf
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
+GNUNET_USER_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
@@ -20,34 +18,41 @@ BROADCAST = NO
 [transport-unix]
 PORT = 12017
 
+[transport-http_server]
+PORT = 12018
+USE_IPv6 = YES
+
+[transport-https_server]
+PORT = 12019
+KEY_FILE = $GNUNET_TEST_HOME/https_key_p1.key
+CERT_FILE = $GNUNET_TEST_HOME/https_cert_p1.crt
+USE_IPv6 = YES
+
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-TRUST = $SERVICEHOME/data/credit/
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
+USE_INCLUDED_HELLOS = NO
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12010
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [ats]
-#DEBUG = YES
-WAN_QUOTA_IN = 1 GB
-WAN_QUOTA_OUT = 1 GB
 PORT = 12016
-UNIXPATH = /tmp/gnunet-p2-service-ats.sock
-
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 
+[hostlist]
+SERVERS = dummy