(no commit message)

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

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index f936386f8c21c645d7c4bd402b8972f4301d40be..6e63edc1d57780f66d946ba7cb55df206709867b 100644 (file)
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -16,11 +16,42 @@ 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 =
@@ -28,6 +59,18 @@ TIMEOUT = 300000
 
 [transport-udp]
 PORT = 2086
+# BEHIND_NAT = 
+# BINDTO = 
+# ALLOW_NAT = 
+# ONLY_NAT_ADDRESSES = 
+# INTERNAL_ADDRESS = 
+# EXTERNAL_ADDRESS = 
+
+[transport-http]
+PORT = 1080
+
+[transport-https]
+PORT = 4433
 
 [arm]
 PORT = 2087
@@ -37,7 +80,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = resolver transport core topology hostlist
+DEFAULTSERVICES = topology hostlist
 UNIXPATH = /tmp/gnunet-service-arm.sock
 # GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
 # GLOBAL_PREFIX =
@@ -201,23 +244,24 @@ DATABASE = sqlite
 FILENAME = $SERVICEHOME/datastore/sqlite.db
 
 [datastore-postgres]
-CONFIG = connect_timeout=10;dbname=gnunet
+CONFIG = connect_timeout=10; dbname=gnunet
 
 [datastore-mysql]
 DATABASE = gnunet
-# CONFIG = ~/.my.cnf
-USER = gnunet
-# PASSWORD =
-# HOST = 
-# PORT = 
+CONFIG = ~/.my.cnf
+# USER = gnunet
+# PASSWORD = 
+# HOST = localhost
+# PORT = 3306
 
 [datacache-mysql]
 DATABASE = gnunetcheck
-# CONFIG = ~/.my.cnf
-USER = gnunet
+CONFIG = ~/.my.cnf
+# USER = gnunet
 # PASSWORD =
-# HOST = 
-# PORT = 
+# HOST = localhost
+# PORT = 3306
+
 
 [fs]
 AUTOSTART = YES
@@ -233,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
@@ -261,6 +308,20 @@ UNIXPATH = /tmp/gnunet-service-dht.sock
 # REJECT_FROM =
 # REJECT_FROM6 =
 # PREFIX =
+# DO_FIND_PEER =
+# STRICT_KADEMLIA =
+# USE_MAX_HOPS =
+# MAX_HOPS =
+# REPUBLISH = YES
+# REPLICATION_FREQUENCY = 60 
+# STOP_ON_CLOSEST =
+# STOP_FOUND =
+# CONVERGE_MODIFIER =
+
+
+[dhtcache]
+DATABASE = sqlite
+QUOTA = 1024000
 
 [block]
 PLUGINS = fs