More fixes for #3522

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

diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in
index 2d92f2e7b002b450f3f943af728e00b683ac1e72..efb326b74400cad97d378597ce17d1ace446edf5 100644 (file)
--- a/src/namestore/namestore.conf.in
+++ b/src/namestore/namestore.conf.in
@@ -1,19 +1,18 @@
 [namestore]
-AUTOSTART = YES
-UNIXPATH = /tmp/gnunet-service-namestore.sock
+AUTOSTART = @AUTOSTART@
+USER_SERVICE = YES
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 @UNIXONLY@ PORT = 2099
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-namestore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 DATABASE = sqlite
-ZONEFILE_DIRECTORY = $SERVICEHOME/zones/
 
 [namestore-sqlite]
-FILENAME = $SERVICEHOME/namestore/sqlite.db
+FILENAME = $GNUNET_DATA_HOME/namestore/sqlite.db
 
 [namestore-postgres]
 CONFIG = connect_timeout=10; dbname=gnunet
@@ -27,10 +26,9 @@ gns = gnunet-namestore
 # Name of the fcfs registration service binary (for ARM)
 BINARY = gnunet-namestore-fcfsd
 AUTOSTART = NO
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-fcfsd.sock
 
 # On what port does the FCFS daemon listen for HTTP clients?
 HTTPPORT = 18080
 
-# Where is the zone key for the FCFS zone stored?
-ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey