diff options
-rw-r--r-- | src/pt/test_gns_vpn.conf | 20 | ||||
-rw-r--r-- | src/pt/test_gnunet_vpn.conf | 11 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf index 8f7046b2d..b0ed23176 100644 --- a/src/pt/test_gns_vpn.conf +++ b/src/pt/test_gns_vpn.conf | |||
@@ -9,6 +9,12 @@ PORT = 0 | |||
9 | ALLOW_SHUTDOWN = YES | 9 | ALLOW_SHUTDOWN = YES |
10 | 10 | ||
11 | [exit] | 11 | [exit] |
12 | FORCESTART = YES | ||
13 | IPV6ADDR = FC5A:04E1:C2BA::1 | ||
14 | IPV6PREFIX = 96 | ||
15 | IPV4ADDR = 169.254.86.1 | ||
16 | IPV4MASK = 255.255.255.0 | ||
17 | |||
12 | EXIT_IPV4 = YES | 18 | EXIT_IPV4 = YES |
13 | EXIT_IPV6 = YES | 19 | EXIT_IPV6 = YES |
14 | 20 | ||
@@ -18,9 +24,9 @@ EXIT_IFNAME = eth1 | |||
18 | [dns] | 24 | [dns] |
19 | DNS_EXIT = 8.8.8.8 | 25 | DNS_EXIT = 8.8.8.8 |
20 | 26 | ||
21 | [testing] | 27 | [hostlist] |
22 | WEAKRANDOM = YES | 28 | AUTOSTART = NO |
23 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | 29 | FORCESTART = NO |
24 | 30 | ||
25 | [nse] | 31 | [nse] |
26 | WORKBITS = 1 | 32 | WORKBITS = 1 |
@@ -34,13 +40,7 @@ IPV6PREFIX = 64 | |||
34 | IPV4ADDR = 169.254.20.1 | 40 | IPV4ADDR = 169.254.20.1 |
35 | IPV4MASK = 255.255.255.0 | 41 | IPV4MASK = 255.255.255.0 |
36 | 42 | ||
37 | [exit] | 43 | [www.gnunet.] |
38 | IPV6ADDR = FC5A:04E1:C2BA::1 | ||
39 | IPV6PREFIX = 96 | ||
40 | IPV4ADDR = 169.254.86.1 | ||
41 | IPV4MASK = 255.255.255.0 | ||
42 | |||
43 | [www.gads.] | ||
44 | TCP_REDIRECTS = 80:localhost4:8080 | 44 | TCP_REDIRECTS = 80:localhost4:8080 |
45 | TTL = 3600000 | 45 | TTL = 3600000 |
46 | 46 | ||
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf index 929215cc5..9c3c2654f 100644 --- a/src/pt/test_gnunet_vpn.conf +++ b/src/pt/test_gnunet_vpn.conf | |||
@@ -9,14 +9,20 @@ PORT = 0 | |||
9 | ALLOW_SHUTDOWN = YES | 9 | ALLOW_SHUTDOWN = YES |
10 | 10 | ||
11 | [exit] | 11 | [exit] |
12 | FORCESTART = YES | ||
12 | EXIT_IPV4 = YES | 13 | EXIT_IPV4 = YES |
13 | EXIT_IPV6 = YES | 14 | EXIT_IPV6 = YES |
15 | IPV6ADDR = FC5A:04E1:C2BA::1 | ||
16 | IPV6PREFIX = 96 | ||
17 | IPV4ADDR = 169.254.86.1 | ||
18 | IPV4MASK = 255.255.255.0 | ||
14 | 19 | ||
15 | # FIXME: can we use 'lo'? | 20 | # FIXME: can we use 'lo'? |
16 | EXIT_IFNAME = eth1 | 21 | EXIT_IFNAME = eth1 |
17 | 22 | ||
18 | [hostlist] | 23 | [hostlist] |
19 | AUTOSTART = NO | 24 | AUTOSTART = NO |
25 | FORCESTART = NO | ||
20 | 26 | ||
21 | [nse] | 27 | [nse] |
22 | WORKBITS = 1 | 28 | WORKBITS = 1 |
@@ -30,11 +36,6 @@ IPV6PREFIX = 64 | |||
30 | IPV4ADDR = 169.254.20.1 | 36 | IPV4ADDR = 169.254.20.1 |
31 | IPV4MASK = 255.255.255.0 | 37 | IPV4MASK = 255.255.255.0 |
32 | 38 | ||
33 | [exit] | ||
34 | IPV6ADDR = FC5A:04E1:C2BA::1 | ||
35 | IPV6PREFIX = 96 | ||
36 | IPV4ADDR = 169.254.86.1 | ||
37 | IPV4MASK = 255.255.255.0 | ||
38 | 39 | ||
39 | [gns] | 40 | [gns] |
40 | AUTOSTART = NO | 41 | AUTOSTART = NO |