X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=contrib%2Fdefaults.conf;h=0e5d9ef11fd17fb268e9e47af6ffbff7b097a22f;hb=582b44420cd908b78342aa01ba96c6f8cc64dccc;hp=d6100b77dba09e1b80ec0b0bc967aa8c78efa425;hpb=0a217a8df1657b4334b55b0e4a6c7837a8dbcfd9;p=oweals%2Fgnunet.git

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index d6100b77d..0e5d9ef11 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,7 +26,6 @@ ALLOW_SHUTDOWN = NO
 # REJECT_FROM =
 # REJECT_FROM6 =
 
-
 [arm]
 PORT = 2087
 HOSTNAME = localhost
@@ -30,7 +34,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 +48,7 @@ ALLOW_SHUTDOWN = YES
 # PREFIX =
 
 [statistics]
+AUTOSTART = YES
 PORT = 2088
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -49,7 +56,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 +68,7 @@ ALLOW_SHUTDOWN = YES
 # PREFIX =
 
 [resolver]
+AUTOSTART = YES
 PORT = 2089
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -67,7 +76,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 +88,7 @@ ALLOW_SHUTDOWN = YES
 # PREFIX =
 
 [peerinfo]
+AUTOSTART = YES
 PORT = 2090
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -85,7 +96,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,21 +107,21 @@ ALLOW_SHUTDOWN = YES
 # REJECT_FROM6 =
 # PREFIX =
 HOSTS = $SERVICEHOME/data/hosts/
-TRUST = $SERVICEHOME/data/credit/
 
 
 [transport]
+AUTOSTART = YES
 PORT = 2091
 HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-transport
-DEFAULT_QUOTA_IN = 50000
-DEFAULT_QUOTA_OUT = 50000
 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 =
@@ -119,8 +131,8 @@ ALLOW_SHUTDOWN = YES
 # REJECT_FROM6 =
 # PREFIX =
 
-
 [core]
+AUTOSTART = YES
 PORT = 2092
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -128,7 +140,12 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-core
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
+# 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 =
@@ -137,3 +154,66 @@ ALLOW_SHUTDOWN = YES
 # REJECT_FROM =
 # REJECT_FROM6 =
 # PREFIX =
+
+
+[topology]
+MINIMUM-FRIENDS = 0
+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
+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://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
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-datastore
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+QUOTA = 100000000
+BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
+DATABASE = sqlite
+# DISABLE_SOCKET_FORWARDING = NO
+
+[datastore-sqlite]
+FILENAME = $SERVICEHOME/datastore/sqlite.db
+
+[fs]
+AUTOSTART = YES
+INDEXDB = $SERVICEHOME/idxinfo.lst
+TRUST = $SERVICEHOME/data/credit/
+IDENTITY_DIR = $SERVICEHOME/identities/
+STATE_DIR = $SERVICEHOME/persistence/
+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