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

[oweals/gnunet.git] / src / gns / test_gns_proxy.conf

diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index b098edb6029329779f28d98f5039c193d3bc2728..51edd5a0c53815bb013a4c36bb9372e06fbf0439 100644 (file)
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -1,11 +1,10 @@
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-gns-proxy/
+GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-gns-proxy/
 
 [transport]
 PLUGINS = tcp
 
 [arm]
-DEFAULTSERVICES = statistics dns namestore gns
 PORT = 0
 ALLOW_SHUTDOWN = YES
 
@@ -14,16 +13,16 @@ WEAKRANDOM = YES
 HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [gns]
-AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/.hostkey
+START_ON_DEMAND = YES
+ZONEKEY = $GNUNET_TEST_HOME/.zonekey
 HIJACK_DNS = YES
 
 [gns-proxy]
 PROXY_CACERT = proxy/test_cert.pem
-PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock
+PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
 
 [namestore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [dns]
 PROVIDE_EXIT = NO