diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-28 23:17:14 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-28 23:17:14 +0000 |
commit | 294a4c7bf269bf5a5f165e511c1f07cdb32d2cc8 (patch) | |
tree | db6dd166acc90d21aa7d6f109410ebe20e2e320d /contrib/defaults.conf | |
parent | 3d9249277dfe61dce18bfc639f597e18daee0dbf (diff) | |
download | gnunet-294a4c7bf269bf5a5f165e511c1f07cdb32d2cc8.tar.gz gnunet-294a4c7bf269bf5a5f165e511c1f07cdb32d2cc8.zip |
new vision for misc options
Diffstat (limited to 'contrib/defaults.conf')
-rw-r--r-- | contrib/defaults.conf | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/contrib/defaults.conf b/contrib/defaults.conf index b29a79361..af9b8f818 100644 --- a/contrib/defaults.conf +++ b/contrib/defaults.conf | |||
@@ -18,31 +18,39 @@ HOME = $SERVICEHOME | |||
18 | [transport-tcp] | 18 | [transport-tcp] |
19 | # Use 0 to ONLY advertise as a peer behind NAT (no port binding) | 19 | # Use 0 to ONLY advertise as a peer behind NAT (no port binding) |
20 | PORT = 2086 | 20 | PORT = 2086 |
21 | ADVERTISED_PORT = 2086 | ||
21 | 22 | ||
22 | # Should we use ICMP-based NAT traversal to try connect to NATed peers? | 23 | # Are we behind NAT? |
23 | ALLOW_NAT = YES | ||
24 | |||
25 | # Are we behind NAT and should use ICMP-based NAT traversal? | ||
26 | BEHIND_NAT = YES | 24 | BEHIND_NAT = YES |
27 | 25 | ||
28 | # IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY; | 26 | # Is the NAT hole-punched? |
29 | # normal interface IP address for non-NATed peers; | 27 | #NEW: PUNCHED_NAT = NO |
30 | # likely auto-detected (via interface list) if not specified (!) | ||
31 | # INTERNAL_ADDRESS = | ||
32 | 28 | ||
33 | # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) | 29 | # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) |
34 | # normal interface IP address for non-NATed peers; | 30 | # normal interface IP address for non-NATed peers; |
35 | # possibly auto-detected (using UPnP) if possible if not specified | 31 | # possibly auto-detected (using UPnP) if possible if not specified |
36 | # EXTERNAL_ADDRESS = | 32 | # EXTERNAL_ADDRESS = |
37 | 33 | ||
34 | # Should we use ICMP-based NAT traversal to try connect to NATed peers | ||
35 | # or, if we are behind NAT, to allow connections to us? | ||
36 | ALLOW_NAT = YES | ||
37 | #NEW: ENABLE_ICMP_CLIENT = YES | ||
38 | #NEW: ENABLE_ICMP_SERVER = YES | ||
39 | |||
40 | # Are we allowed to try UPnP/PMP? | ||
41 | ENABLE_UPNP = YES | ||
42 | |||
43 | # IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY; | ||
44 | # normal interface IP address for non-NATed peers; | ||
45 | # likely auto-detected (via interface list) if not specified (!) | ||
46 | # INTERNAL_ADDRESS = | ||
47 | |||
38 | # Only bind to a specific IP address; if both are given, this should be idential to INTERNAL_ADDRESS | 48 | # Only bind to a specific IP address; if both are given, this should be idential to INTERNAL_ADDRESS |
39 | # (but use different: this one restricts our bind!) | 49 | # (but use different: this one restricts our bind!) |
40 | # BINDTO = | 50 | # BINDTO = |
41 | 51 | ||
42 | TIMEOUT = 300000 | 52 | TIMEOUT = 300000 |
43 | 53 | ||
44 | # Are we allowed to try UPnP/PMP? | ||
45 | ENABLE_UPNP = YES | ||
46 | # Disable IPv6 support | 54 | # Disable IPv6 support |
47 | # DISABLEV6 = | 55 | # DISABLEV6 = |
48 | # ACCEPT_FROM = | 56 | # ACCEPT_FROM = |
@@ -270,7 +278,11 @@ CONFIG = $DEFAULTCONFIG | |||
270 | BINARY = gnunet-service-fs | 278 | BINARY = gnunet-service-fs |
271 | ACCEPT_FROM = 127.0.0.1; | 279 | ACCEPT_FROM = 127.0.0.1; |
272 | ACCEPT_FROM6 = ::1; | 280 | ACCEPT_FROM6 = ::1; |
281 | |||
273 | ACTIVEMIGRATION = YES | 282 | ACTIVEMIGRATION = YES |
283 | # NEW: CONTENT_CACHING = YES | ||
284 | # NEW: CONTENT_PUSHING = YES | ||
285 | |||
274 | UNIXPATH = /tmp/gnunet-service-fs.sock | 286 | UNIXPATH = /tmp/gnunet-service-fs.sock |
275 | # DISABLE_SOCKET_FORWARDING = NO | 287 | # DISABLE_SOCKET_FORWARDING = NO |
276 | # DEBUG = YES | 288 | # DEBUG = YES |