projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
defaults for newly required testing options
[oweals/gnunet.git]
/
contrib
/
defaults.conf
diff --git
a/contrib/defaults.conf
b/contrib/defaults.conf
index af9b8f818cb41faa65652e5e6f07f22491790a1a..539ffd351d54d3c7cf34b0cbf11f460ad29ba02f 100644
(file)
--- a/
contrib/defaults.conf
+++ b/
contrib/defaults.conf
@@
-11,6
+11,12
@@
HOSTKEY = $SERVICEHOME/.hostkey
[TESTING]
WEAKRANDOM = NO
[TESTING]
WEAKRANDOM = NO
+# How long before failing a connection?
+CONNECT_TIMEOUT = 30
+# How many connect attempts should we make?
+CONNECT_ATTEMPTS = 3
+# How many connections can happen simultaneously?
+MAX_OUTSTANDING_CONNECTS = 50
[client]
HOME = $SERVICEHOME
[client]
HOME = $SERVICEHOME
@@
-24,7
+30,10
@@
ADVERTISED_PORT = 2086
BEHIND_NAT = YES
# Is the NAT hole-punched?
BEHIND_NAT = YES
# Is the NAT hole-punched?
-#NEW: PUNCHED_NAT = NO
+PUNCHED_NAT = NO
+
+# Disable UPNP by default until it gets cleaner!
+ENABLE_UPNP = 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;
# 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;
@@
-33,12
+42,8
@@
BEHIND_NAT = YES
# Should we use ICMP-based NAT traversal to try connect to NATed peers
# or, if we are behind NAT, to allow connections to us?
# Should we use ICMP-based NAT traversal to try connect to NATed peers
# or, if we are behind NAT, to allow connections to us?
-ALLOW_NAT = YES
-#NEW: ENABLE_ICMP_CLIENT = YES
-#NEW: ENABLE_ICMP_SERVER = YES
-
-# Are we allowed to try UPnP/PMP?
-ENABLE_UPNP = YES
+ENABLE_ICMP_CLIENT = YES
+ENABLE_ICMP_SERVER = YES
# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
# normal interface IP address for non-NATed peers;
# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
# normal interface IP address for non-NATed peers;
@@
-83,6
+88,8
@@
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
DEFAULTSERVICES = topology hostlist
UNIXPATH = /tmp/gnunet-service-arm.sock
ACCEPT_FROM6 = ::1;
DEFAULTSERVICES = topology hostlist
UNIXPATH = /tmp/gnunet-service-arm.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
# GLOBAL_PREFIX =
# USERNAME =
# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
# GLOBAL_PREFIX =
# USERNAME =
@@
-104,6
+111,8
@@
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
UNIXPATH = /tmp/gnunet-service-statistics.sock
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
UNIXPATH = /tmp/gnunet-service-statistics.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
# DISABLE_SOCKET_FORWARDING = NO
# USERNAME =
# MAXBUF =
# DISABLE_SOCKET_FORWARDING = NO
# USERNAME =
# MAXBUF =
@@
-124,6
+133,8
@@
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
UNIXPATH = /tmp/gnunet-service-resolver.sock
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
UNIXPATH = /tmp/gnunet-service-resolver.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = NO
# DISABLE_SOCKET_FORWARDING = NO
# USERNAME =
# MAXBUF =
# DISABLE_SOCKET_FORWARDING = NO
# USERNAME =
# MAXBUF =
@@
-144,6
+155,8
@@
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
UNIXPATH = /tmp/gnunet-service-peerinfo.sock
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
UNIXPATH = /tmp/gnunet-service-peerinfo.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
# DISABLE_SOCKET_FORWARDING = NO
# USERNAME =
# MAXBUF =
# DISABLE_SOCKET_FORWARDING = NO
# USERNAME =
# MAXBUF =
@@
-168,6
+181,9
@@
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
PLUGINS = tcp
UNIXPATH = /tmp/gnunet-service-transport.sock
ACCEPT_FROM6 = ::1;
PLUGINS = tcp
UNIXPATH = /tmp/gnunet-service-transport.sock
+BLACKLIST_FILE = $SERVICEHOME/blacklist
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
# DISABLE_SOCKET_FORWARDING = NO
# USERNAME =
# MAXBUF =
# DISABLE_SOCKET_FORWARDING = NO
# USERNAME =
# MAXBUF =
@@
-191,6
+207,8
@@
ACCEPT_FROM6 = ::1;
TOTAL_QUOTA_IN = 65536
TOTAL_QUOTA_OUT = 65536
UNIXPATH = /tmp/gnunet-service-core.sock
TOTAL_QUOTA_IN = 65536
TOTAL_QUOTA_OUT = 65536
UNIXPATH = /tmp/gnunet-service-core.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
# DISABLE_SOCKET_FORWARDING = NO
# DEBUG = YES
# USERNAME =
# DISABLE_SOCKET_FORWARDING = NO
# DEBUG = YES
# USERNAME =
@@
-229,6
+247,8
@@
HTTP-PROXY =
[datastore]
AUTOSTART = YES
UNIXPATH = /tmp/gnunet-service-datastore.sock
[datastore]
AUTOSTART = YES
UNIXPATH = /tmp/gnunet-service-datastore.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
PORT = 2093
HOSTNAME = localhost
HOME = $SERVICEHOME
PORT = 2093
HOSTNAME = localhost
HOME = $SERVICEHOME
@@
-279,14
+299,18
@@
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-ACTIVEMIGRATION = YES
-# NEW: CONTENT_CACHING = YES
-# NEW: CONTENT_PUSHING = YES
+CONTENT_CACHING = YES
+CONTENT_PUSHING = YES
UNIXPATH = /tmp/gnunet-service-fs.sock
UNIXPATH = /tmp/gnunet-service-fs.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
# DISABLE_SOCKET_FORWARDING = NO
# DEBUG = YES
MAX_PENDING_REQUESTS = 65536
# DISABLE_SOCKET_FORWARDING = NO
# DEBUG = YES
MAX_PENDING_REQUESTS = 65536
+# Maximum frequency we're allowed to poll the datastore
+# for content for migration (can be used to reduce
+# GNUnet's disk-IO rate)
MIN_MIGRATION_DELAY = 1000
EXPECTED_NEIGHBOUR_COUNT = 128
MIN_MIGRATION_DELAY = 1000
EXPECTED_NEIGHBOUR_COUNT = 128
@@
-299,7
+323,10
@@
CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
+BUCKET_SIZE = 4
UNIXPATH = /tmp/gnunet-service-dht.sock
UNIXPATH = /tmp/gnunet-service-dht.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
# DISABLE_SOCKET_FORWARDING = NO
# DEBUG = YES
# USERNAME =
# DISABLE_SOCKET_FORWARDING = NO
# DEBUG = YES
# USERNAME =
@@
-326,4
+353,4
@@
DATABASE = sqlite
QUOTA = 1024000
[block]
QUOTA = 1024000
[block]
-PLUGINS = fs
+PLUGINS = fs
dht test