[GNUnet-SVN] r35783 - gnunet/src/pt

[gnunet]

Author: grothoff
Date: 2015-05-22 12:05:49 +0200 (Fri, 22 May 2015)
New Revision: 35783

Modified:
   gnunet/src/pt/test_gns_vpn.conf
   gnunet/src/pt/test_gnunet_vpn.conf
Log:
-fix configs to comply with current version

Modified: gnunet/src/pt/test_gns_vpn.conf
===================================================================
--- gnunet/src/pt/test_gns_vpn.conf     2015-05-22 10:00:48 UTC (rev 35782)
+++ gnunet/src/pt/test_gns_vpn.conf     2015-05-22 10:05:49 UTC (rev 35783)
@@ -9,6 +9,12 @@
 ALLOW_SHUTDOWN = YES
 
 [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,9 +24,9 @@
 [dns]
 DNS_EXIT = 8.8.8.8
 
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+[hostlist]
+AUTOSTART = NO
+FORCESTART = NO
 
 [nse]
 WORKBITS = 1
@@ -34,13 +40,7 @@
 IPV4ADDR = 169.254.20.1
 IPV4MASK = 255.255.255.0
 
-[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
 

Modified: gnunet/src/pt/test_gnunet_vpn.conf
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.conf  2015-05-22 10:00:48 UTC (rev 35782)
+++ gnunet/src/pt/test_gnunet_vpn.conf  2015-05-22 10:05:49 UTC (rev 35783)
@@ -9,8 +9,13 @@
 ALLOW_SHUTDOWN = YES
 
 [exit]
+FORCESTART = YES
 EXIT_IPV4 = YES
 EXIT_IPV6 = YES
+IPV6ADDR = FC5A:04E1:C2BA::1
+IPV6PREFIX = 96
+IPV4ADDR = 169.254.86.1
+IPV4MASK = 255.255.255.0
 
 # FIXME: can we use 'lo'?
 EXIT_IFNAME = eth1
@@ -17,6 +22,7 @@
 
 [hostlist]
 AUTOSTART = NO
+FORCESTART = NO
 
 [nse]
 WORKBITS = 1
@@ -30,11 +36,6 @@
 IPV4ADDR = 169.254.20.1
 IPV4MASK = 255.255.255.0
 
-[exit]
-IPV6ADDR = FC5A:04E1:C2BA::1
-IPV6PREFIX = 96
-IPV4ADDR = 169.254.86.1
-IPV4MASK = 255.255.255.0
 
 [gns]
 AUTOSTART = NO