ifdef instead of if

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

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index a7ca884d7d141b4992c9c82f00a17e13f53913fb..65c286c256085328d87b9ed1dc75764dbb88bef9 100644 (file)
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -9,7 +9,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
 WEAKRANDOM = NO
 
 
-[tcp]
+[transport-tcp]
 PORT = 2086
 TIMEOUT = 300000
 ALLOW_SHUTDOWN = NO
@@ -31,6 +31,7 @@ BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 ALLOW_SHUTDOWN = YES
+DEFAULTSERVICES = resolver transport core 
 # GLOBAL_PREFIX =
 # USERNAME =
 # MAXBUF =
@@ -117,7 +118,6 @@ ALLOW_SHUTDOWN = YES
 # REJECT_FROM6 =
 # PREFIX =
 
-
 [core]
 PORT = 2092
 HOSTNAME = localhost
@@ -146,16 +146,21 @@ 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
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-hostlist
 # consider having "-e" as default as well once implemented
 OPTIONS = -b
 SERVERS = http://gnunet.org:8080/
 # proxy for downloading hostlists
 HTTP-PROXY = 
-# port for hostlist server
-PORT = 8080
 
 
 [datastore]
@@ -167,6 +172,21 @@ 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
+
+[datastore-sqlite]
+FILENAME = $SERVICEHOME/datastore/sqlite.db
+
+[fs]
+INDEXDB = $SERVICEHOME/idxinfo.lst
+PORT = 2094
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-fs
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+ALLOW_SHUTDOWN = YES
+