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

[oweals/gnunet.git] / src / pt / test_gns_vpn.conf

diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index b0ed23176fb724584d9e9a0d6a353187017e8cb3..86642465f348adf87cfc90b55fe588013f8b6b78 100644 (file)
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -7,6 +7,8 @@ PLUGINS = tcp
 [arm]
 PORT = 0
 ALLOW_SHUTDOWN = YES
+SYSTEM_ONLY = NO
+USER_ONLY = NO
 
 [exit]
 FORCESTART = YES
@@ -23,11 +25,23 @@ EXIT_IFNAME = eth1
 
 [dns]
 DNS_EXIT = 8.8.8.8
+FORCESTART = YES
+
+[identity]
+AUTOSTART = YES
+FORCESTART = YES
 
 [hostlist]
 AUTOSTART = NO
 FORCESTART = NO
 
+[zonemaster]
+AUTOSTART = YES
+FORCESTART = YES
+
+#[vpn]
+#PREFIX = valgrind
+
 [nse]
 WORKBITS = 1
 
@@ -39,6 +53,8 @@ IPV6ADDR = FC2D:FDAA:6A26::1
 IPV6PREFIX = 64
 IPV4ADDR = 169.254.20.1
 IPV4MASK = 255.255.255.0
+#PREFIX = valgrind
+
 
 [www.gnunet.]
 TCP_REDIRECTS = 80:localhost4:8080
@@ -46,8 +62,11 @@ TTL = 3600000
 
 [gns]
 AUTOSTART = YES
-ZONEKEY = $GNUNET_TEST_HOME/.hostkey
-HIJACK_DNS = YES
+ZONEKEY = $GNUNET_TEST_HOME/.zonekey
+
+# Delays starting of GNS, as we need to first
+# setup the identity subsystem properly.
+FORCESTART = NO
 
 [namestore]
 AUTOSTART = YES