Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / fs / fs.conf.in

diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index 087185b0c7ec7365d9cb6d11edd2215cb6b0e818..d46de387f27389716894ec5b1b000d1dfd57bb94 100644 (file)
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -1,5 +1,6 @@
 [fs]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
+FORCESTART = YES
 INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst
 RESPECT = $GNUNET_DATA_HOME/fs/credit/
 STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/
@@ -35,7 +36,7 @@ MAX_PENDING_REQUESTS = 65536
 
 # How many requests do we have at most waiting in the queue towards
 # the datastore? (important for memory consumption)
-DATASTORE_QUEUE_SIZE = 1024
+DATASTORE_QUEUE_SIZE = 32
 
 # Maximum frequency we're allowed to poll the datastore
 # for content for migration (can be used to reduce
@@ -53,13 +54,14 @@ DISABLE_ANON_TRANSFER = NO
 # at the same time.  Excessive values mostly have the problem that
 # the service might use more memory, so we need to bound this at
 # some reasonable level.  And if we have a very, very large
-# number, we probably won't have enough bandwidth to suppor them
+# number, we probably won't have enough bandwidth to support them
 # well anyway, so better have a moderate cap.
-MAX_MESH_CLIENTS = 128
+MAX_CADET_CLIENTS = 128
 
 
 [gnunet-auto-share]
 BINARY = gnunet-auto-share
+FORCESTART = NO
 
 # Note: MUST specify path to auto-share directory and CAN specify other options
 # to gnunet-auto-share here!