UNIX domain socket support

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

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index 21ca85f463a252d07803d5a91275b1fc3e75c984..c250ebe871a931c46d500d4c967d18e59653991a 100644 (file)
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -1,6 +1,10 @@
 [PATHS]
-SERVICEHOME = /var/lib/gnunet/
-DEFAULTCONFIG = /etc/gnunet.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
 
 [transport-tcp]
 PORT = 2086
 TIMEOUT = 300000
-ALLOW_SHUTDOWN = NO
 # MAXBUF =
 # DISABLEV6 =
 # BINDTO =
@@ -30,8 +35,9 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
-DEFAULTSERVICES = resolver transport core 
+DEFAULTSERVICES = resolver transport core topology hostlist
+UNIXPATH = /tmp/gnunet-service-arm.sock
+# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
 # GLOBAL_PREFIX =
 # USERNAME =
 # MAXBUF =
@@ -43,6 +49,7 @@ DEFAULTSERVICES = resolver transport core
 # PREFIX =
 
 [statistics]
+AUTOSTART = YES
 PORT = 2088
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -50,7 +57,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-statistics
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
+UNIXPATH = /tmp/gnunet-service-statistics.sock
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -61,6 +68,7 @@ ALLOW_SHUTDOWN = YES
 # PREFIX =
 
 [resolver]
+AUTOSTART = YES
 PORT = 2089
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -68,7 +76,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-resolver
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
+UNIXPATH = /tmp/gnunet-service-resolver.sock
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -79,6 +87,7 @@ ALLOW_SHUTDOWN = YES
 # PREFIX =
 
 [peerinfo]
+AUTOSTART = YES
 PORT = 2090
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -86,7 +95,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-peerinfo
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
+UNIXPATH = /tmp/gnunet-service-peerinfo.sock
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -100,6 +109,7 @@ TRUST = $SERVICEHOME/data/credit/
 
 
 [transport]
+AUTOSTART = YES
 PORT = 2091
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -108,8 +118,8 @@ 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
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -120,6 +130,7 @@ PLUGINS = tcp
 # PREFIX =
 
 [core]
+AUTOSTART = YES
 PORT = 2092
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -127,10 +138,11 @@ 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
+# DEBUG = YES
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -153,8 +165,8 @@ 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
@@ -165,6 +177,8 @@ HTTP-PROXY =
 
 
 [datastore]
+AUTOSTART = YES
+UNIXPATH = /tmp/gnunet-service-datastore.sock
 PORT = 2093
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -172,7 +186,6 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-datastore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
 QUOTA = 100000000
 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = sqlite
@@ -181,7 +194,10 @@ DATABASE = sqlite
 FILENAME = $SERVICEHOME/datastore/sqlite.db
 
 [fs]
+AUTOSTART = YES
 INDEXDB = $SERVICEHOME/idxinfo.lst
+IDENTITY_DIR = $SERVICEHOME/identities/
+STATE_DIR = $SERVICEHOME/persistence/
 PORT = 2094
 HOSTNAME = localhost
 HOME = $SERVICEHOME
@@ -189,5 +205,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-fs
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-ALLOW_SHUTDOWN = YES
+ACTIVEMIGRATION = YES
+UNIXPATH = /tmp/gnunet-service-fs.sock
+# DEBUG = YES