(no commit message)

[oweals/gnunet.git] / contrib / defaults.conf

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index 6c6faa3d74b15b86464ef68f72acda9c398c34cd..6e63edc1d57780f66d946ba7cb55df206709867b 100644 (file)
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -16,20 +16,46 @@ WEAKRANDOM = NO
 HOME = $SERVICEHOME
 
 [transport-tcp]
+# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
 PORT = 2086
+ADVERTISED_PORT = 2086
+
+# Are we behind NAT?
+BEHIND_NAT = YES
+
+# Is the NAT hole-punched?
+PUNCHED_NAT = NO
+
+# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
+# normal interface IP address for non-NATed peers; 
+# possibly auto-detected (using UPnP) if possible if not specified
+# EXTERNAL_ADDRESS = 
+
+# Should we use ICMP-based NAT traversal to try connect to NATed peers
+# or, if we are behind NAT, to allow connections to us?
+ENABLE_ICMP_CLIENT = YES
+ENABLE_ICMP_SERVER = YES
+
+# Are we allowed to try UPnP/PMP?
+ENABLE_UPNP = YES
+
+# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
+# normal interface IP address for non-NATed peers; 
+# likely auto-detected (via interface list) if not specified (!)
+# INTERNAL_ADDRESS = 
+
+# Only bind to a specific IP address; if both are given, this should be idential to INTERNAL_ADDRESS
+# (but use different: this one restricts our bind!)
+# BINDTO =
+
 TIMEOUT = 300000
-# MAXBUF =
+
+# Disable IPv6 support
 # DISABLEV6 =
-# BINDTO =
 # ACCEPT_FROM =
 # ACCEPT_FROM6 =
 # REJECT_FROM =
 # REJECT_FROM6 =
-# BEHIND_NAT =
-# ONLY_NAT_ADDRESSES =
-# ALLOW_NAT = 
-# INTERNAL_ADDRESS = 
-# EXTERNAL_ADDRESS = 
 
 [transport-udp]
 PORT = 2086
@@ -251,7 +277,10 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-fs
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ACTIVEMIGRATION = YES
+
+CONTENT_CACHING = YES
+CONTENT_PUSHING = YES
+
 UNIXPATH = /tmp/gnunet-service-fs.sock
 # DISABLE_SOCKET_FORWARDING = NO
 # DEBUG = YES