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 fa12b98baede50fe8927e25f1441ba82f641a593..86642465f348adf87cfc90b55fe588013f8b6b78 100644 (file)
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -1,15 +1,22 @@
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-gns-vpn/
+GNUNET_TEST_HOME = /tmp/gnunet-test-gns-vpn/
 
 [transport]
 PLUGINS = tcp
 
 [arm]
-DEFAULTSERVICES = statistics exit mesh vpn namestore gns
 PORT = 0
 ALLOW_SHUTDOWN = YES
+SYSTEM_ONLY = NO
+USER_ONLY = NO
 
 [exit]
+FORCESTART = YES
+IPV6ADDR = FC5A:04E1:C2BA::1
+IPV6PREFIX = 96
+IPV4ADDR = 169.254.86.1
+IPV4MASK = 255.255.255.0
+
 EXIT_IPV4 = YES
 EXIT_IPV6 = YES
 
@@ -18,10 +25,22 @@ EXIT_IFNAME = eth1
 
 [dns]
 DNS_EXIT = 8.8.8.8
+FORCESTART = YES
 
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+[identity]
+AUTOSTART = YES
+FORCESTART = YES
+
+[hostlist]
+AUTOSTART = NO
+FORCESTART = NO
+
+[zonemaster]
+AUTOSTART = YES
+FORCESTART = YES
+
+#[vpn]
+#PREFIX = valgrind
 
 [nse]
 WORKBITS = 1
@@ -34,21 +53,24 @@ IPV6ADDR = FC2D:FDAA:6A26::1
 IPV6PREFIX = 64
 IPV4ADDR = 169.254.20.1
 IPV4MASK = 255.255.255.0
+#PREFIX = valgrind
 
-[exit]
-IPV6ADDR = FC5A:04E1:C2BA::1
-IPV6PREFIX = 96
-IPV4ADDR = 169.254.86.1
-IPV4MASK = 255.255.255.0
 
-[www.gads.]
+[www.gnunet.]
 TCP_REDIRECTS = 80:localhost4:8080
 TTL = 3600000
 
 [gns]
 AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/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
+
+[nat]
+USE_LOCALADDR = YES
+RETURN_LOCAL_ADDRESSES = YES