X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=contrib%2Fdefaults.conf;h=f936386f8c21c645d7c4bd402b8972f4301d40be;hb=8533f3d1d476ea215f90da8059fd99c1dc6edf3e;hp=d3eb190fca8069bbaea4f57009021af868261f2f;hpb=b2b1773aaa6e7c0c61ff7ac5a5766a8a2ea25495;p=oweals%2Fgnunet.git

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index d3eb190fc..f936386f8 100644
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -1,6 +1,10 @@
 [PATHS]
-SERVICEHOME = /var/lib/gnunet/
-DEFAULTCONFIG = /etc/gnunetd.conf
+SERVICEHOME = ~/.gnunet/
+# SERVICEHOME = /var/lib/gnunet/
+# DEFAULTCONFIG = /etc/gnunet.conf
+# If 'DEFAULTCONFIG' is not defined, the current
+# configuration file is assumed to be the default,
+# which is what we want by default...
 
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey
@@ -8,11 +12,12 @@ HOSTKEY = $SERVICEHOME/.hostkey
 [TESTING]
 WEAKRANDOM = NO
 
+[client]
+HOME = $SERVICEHOME
 
-[tcp]
+[transport-tcp]
 PORT = 2086
 TIMEOUT = 300000
-ALLOW_SHUTDOWN = NO
 # MAXBUF =
 # DISABLEV6 =
 # BINDTO =
@@ -21,6 +26,8 @@ ALLOW_SHUTDOWN = NO
 # REJECT_FROM =
 # REJECT_FROM6 =
 
+[transport-udp]
+PORT = 2086
 
 [arm]
 PORT = 2087
@@ -30,7 +37,9 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
+DEFAULTSERVICES = resolver transport core topology hostlist
+UNIXPATH = /tmp/gnunet-service-arm.sock
+# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
 # GLOBAL_PREFIX =
 # USERNAME =
 # MAXBUF =
@@ -42,6 +51,7 @@ ALLOW_SHUTDOWN = YES
 # PREFIX =
 
 [statistics]
+AUTOSTART = YES
 PORT = 2088
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -49,7 +59,8 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-statistics
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
+UNIXPATH = /tmp/gnunet-service-statistics.sock
+# DISABLE_SOCKET_FORWARDING = NO
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -60,6 +71,7 @@ ALLOW_SHUTDOWN = YES
 # PREFIX =
 
 [resolver]
+AUTOSTART = YES
 PORT = 2089
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -67,7 +79,8 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-resolver
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
+UNIXPATH = /tmp/gnunet-service-resolver.sock
+# DISABLE_SOCKET_FORWARDING = NO
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -78,6 +91,7 @@ ALLOW_SHUTDOWN = YES
 # PREFIX =
 
 [peerinfo]
+AUTOSTART = YES
 PORT = 2090
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -85,7 +99,8 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-peerinfo
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
+UNIXPATH = /tmp/gnunet-service-peerinfo.sock
+# DISABLE_SOCKET_FORWARDING = NO
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -95,10 +110,10 @@ ALLOW_SHUTDOWN = YES
 # REJECT_FROM6 =
 # PREFIX =
 HOSTS = $SERVICEHOME/data/hosts/
-TRUST = $SERVICEHOME/data/credit/
 
 
 [transport]
+AUTOSTART = YES
 PORT = 2091
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -107,7 +122,9 @@ BINARY = gnunet-service-transport
 NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
+PLUGINS = tcp
+UNIXPATH = /tmp/gnunet-service-transport.sock
+# DISABLE_SOCKET_FORWARDING = NO
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -117,8 +134,8 @@ ALLOW_SHUTDOWN = YES
 # REJECT_FROM6 =
 # PREFIX =
 
-
 [core]
+AUTOSTART = YES
 PORT = 2092
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -126,10 +143,12 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-core
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
-# quotas are in bytes per minute now!
-TOTAL_QUOTA_IN = 3932160
-TOTAL_QUOTA_OUT = 3932160
+# quotas are in bytes per second now!
+TOTAL_QUOTA_IN = 65536
+TOTAL_QUOTA_OUT = 65536
+UNIXPATH = /tmp/gnunet-service-core.sock
+# DISABLE_SOCKET_FORWARDING = NO
+# DEBUG = YES
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -146,23 +165,26 @@ FRIENDS-ONLY = NO
 AUTOCONNECT = YES
 TARGET-CONNECTION-COUNT = 16
 FRIENDS = $SERVICEHOME/friends
-
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-topology
 
 [hostlist]
 # port for hostlist http server
 HTTPPORT = 8080
-HOSTNAME = localhost
 HOME = $SERVICEHOME
+HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
 CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-hostlist
 # consider having "-e" as default as well once implemented
 OPTIONS = -b
-SERVERS = http://gnunet.org:8080/
+SERVERS = http://v9.gnunet.org:58080/
 # proxy for downloading hostlists
 HTTP-PROXY = 
 
 
 [datastore]
+AUTOSTART = YES
+UNIXPATH = /tmp/gnunet-service-datastore.sock
 PORT = 2093
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -170,7 +192,75 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-datastore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
-QUOTA = 10000000
+QUOTA = 100000000
 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = sqlite
+# DISABLE_SOCKET_FORWARDING = NO
+
+[datastore-sqlite]
+FILENAME = $SERVICEHOME/datastore/sqlite.db
+
+[datastore-postgres]
+CONFIG = connect_timeout=10;dbname=gnunet
+
+[datastore-mysql]
+DATABASE = gnunet
+# CONFIG = ~/.my.cnf
+USER = gnunet
+# PASSWORD =
+# HOST = 
+# PORT = 
+
+[datacache-mysql]
+DATABASE = gnunetcheck
+# CONFIG = ~/.my.cnf
+USER = gnunet
+# PASSWORD =
+# HOST = 
+# PORT = 
+
+[fs]
+AUTOSTART = YES
+INDEXDB = $SERVICEHOME/idxinfo.lst
+TRUST = $SERVICEHOME/data/credit/
+IDENTITY_DIR = $SERVICEHOME/identities/
+STATE_DIR = $SERVICEHOME/persistence/
+UPDATE_DIR = $SERVICEHOME/updates/
+PORT = 2094
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-fs
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+ACTIVEMIGRATION = YES
+UNIXPATH = /tmp/gnunet-service-fs.sock
+# DISABLE_SOCKET_FORWARDING = NO
+# DEBUG = YES
+MAX_PENDING_REQUESTS = 65536
+MIN_MIGRATION_DELAY = 1000
+EXPECTED_NEIGHBOUR_COUNT = 128
+
+[dht]
+AUTOSTART = YES
+PORT = 2095
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dht
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-dht.sock
+# DISABLE_SOCKET_FORWARDING = NO
+# DEBUG = YES
+# USERNAME = 
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+
+[block]
+PLUGINS = fs