fix indentation, typo, improve logging

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

diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in
index 7a92070d7e7bb468b125babd7a437c87c1c1be87..b6b7c13bc94b3b4c43b2267319d709751663d574 100644 (file)
--- a/src/datastore/datastore.conf.in
+++ b/src/datastore/datastore.conf.in
@@ -1,21 +1,20 @@
 [datastore]
-AUTOSTART = YES
-UNIXPATH = /tmp/gnunet-service-datastore.sock
+AUTOSTART = @AUTOSTART@
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 @UNIXONLY@ PORT = 2093
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-datastore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 QUOTA = 5 GB
-BLOOMFILTER = $SERVICEHOME/datastore/bloomfilter
+BLOOMFILTER = $GNUNET_DATA_HOME/datastore/bloomfilter
 DATABASE = sqlite
 # DISABLE_SOCKET_FORWARDING = NO
 
 [datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+FILENAME = $GNUNET_DATA_HOME/datastore/sqlite.db
 
 [datastore-postgres]
 CONFIG = connect_timeout=10; dbname=gnunet
@@ -24,7 +23,7 @@ CONFIG = connect_timeout=10; dbname=gnunet
 DATABASE = gnunet
 CONFIG = ~/.my.cnf
 # USER = gnunet
-# PASSWORD = 
+# PASSWORD =
 # HOST = localhost
 # PORT = 3306