diff options
author | xrs <xrs@mail36.net> | 2018-06-23 16:58:42 +0200 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2018-06-23 16:58:42 +0200 |
commit | 99c6e18e63181d8759ecbb398d58019a55d3ce6f (patch) | |
tree | cf925bf99a6fbe60dbec8ead7248bc59a0c8cce6 /src/pt | |
parent | b993ca621717d0a9958b4138a32fb1e3cef7f54c (diff) | |
parent | c293f84ea192f361baf720a3979589c0e0881abc (diff) | |
download | gnunet-99c6e18e63181d8759ecbb398d58019a55d3ce6f.tar.gz gnunet-99c6e18e63181d8759ecbb398d58019a55d3ce6f.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/pt')
-rw-r--r-- | src/pt/test_gns_vpn.conf | 14 | ||||
-rw-r--r-- | src/pt/test_gnunet_vpn.conf | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf index c603b7422..4fd4d8b8a 100644 --- a/src/pt/test_gns_vpn.conf +++ b/src/pt/test_gns_vpn.conf | |||
@@ -7,8 +7,8 @@ PLUGINS = tcp | |||
7 | [arm] | 7 | [arm] |
8 | PORT = 0 | 8 | PORT = 0 |
9 | ALLOW_SHUTDOWN = YES | 9 | ALLOW_SHUTDOWN = YES |
10 | SYSTEM_ONLY = NO | 10 | START_SYSTEM_SERVICES = NO |
11 | USER_ONLY = NO | 11 | START_USER_SERVICES = NO |
12 | 12 | ||
13 | [exit] | 13 | [exit] |
14 | FORCESTART = YES | 14 | FORCESTART = YES |
@@ -28,15 +28,15 @@ DNS_EXIT = 8.8.8.8 | |||
28 | FORCESTART = YES | 28 | FORCESTART = YES |
29 | 29 | ||
30 | [identity] | 30 | [identity] |
31 | AUTOSTART = YES | 31 | START_ON_DEMAND = YES |
32 | FORCESTART = YES | 32 | FORCESTART = YES |
33 | 33 | ||
34 | [hostlist] | 34 | [hostlist] |
35 | AUTOSTART = NO | 35 | START_ON_DEMAND = NO |
36 | FORCESTART = NO | 36 | FORCESTART = NO |
37 | 37 | ||
38 | [zonemaster] | 38 | [zonemaster] |
39 | AUTOSTART = YES | 39 | START_ON_DEMAND = YES |
40 | FORCESTART = YES | 40 | FORCESTART = YES |
41 | 41 | ||
42 | #[vpn] | 42 | #[vpn] |
@@ -61,7 +61,7 @@ TCP_REDIRECTS = 80:localhost4:8080 | |||
61 | TTL = 3600000 | 61 | TTL = 3600000 |
62 | 62 | ||
63 | [gns] | 63 | [gns] |
64 | AUTOSTART = YES | 64 | START_ON_DEMAND = YES |
65 | ZONEKEY = $GNUNET_TEST_HOME/.zonekey | 65 | ZONEKEY = $GNUNET_TEST_HOME/.zonekey |
66 | 66 | ||
67 | # Delays starting of GNS, as we need to first | 67 | # Delays starting of GNS, as we need to first |
@@ -69,7 +69,7 @@ ZONEKEY = $GNUNET_TEST_HOME/.zonekey | |||
69 | FORCESTART = NO | 69 | FORCESTART = NO |
70 | 70 | ||
71 | [namestore] | 71 | [namestore] |
72 | AUTOSTART = YES | 72 | START_ON_DEMAND = YES |
73 | 73 | ||
74 | [nat] | 74 | [nat] |
75 | USE_LOCALADDR = YES | 75 | USE_LOCALADDR = YES |
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf index c22cd3409..dfe553784 100644 --- a/src/pt/test_gnunet_vpn.conf +++ b/src/pt/test_gnunet_vpn.conf | |||
@@ -21,7 +21,7 @@ IPV4MASK = 255.255.255.0 | |||
21 | EXIT_IFNAME = eth1 | 21 | EXIT_IFNAME = eth1 |
22 | 22 | ||
23 | [hostlist] | 23 | [hostlist] |
24 | AUTOSTART = NO | 24 | START_ON_DEMAND = NO |
25 | FORCESTART = NO | 25 | FORCESTART = NO |
26 | 26 | ||
27 | [nse] | 27 | [nse] |
@@ -38,11 +38,11 @@ IPV4MASK = 255.255.255.0 | |||
38 | 38 | ||
39 | 39 | ||
40 | [gns] | 40 | [gns] |
41 | AUTOSTART = NO | 41 | START_ON_DEMAND = NO |
42 | 42 | ||
43 | [nat] | 43 | [nat] |
44 | USE_LOCALADDR = YES | 44 | USE_LOCALADDR = YES |
45 | RETURN_LOCAL_ADDRESSES = YES | 45 | RETURN_LOCAL_ADDRESSES = YES |
46 | 46 | ||
47 | [consensus] | 47 | [consensus] |
48 | AUTOSTART = NO | 48 | START_ON_DEMAND = NO |