fixes

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

diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index b96ab7b5d1d0c9add53921483fa6923edb7947b6..beb0ae9a96fffa05d6b15a644d0dd2b862e54e47 100644 (file)
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,14 +1,11 @@
 [gns]
 AUTOSTART = YES
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-gns
-UNIXPATH = /tmp/gnunet-service-gns.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-gns.sock
 @UNIXONLY@PORT = 2102
 
-ZONE_DIR = $SERVICEHOME/gns/
-
-# Do we require users that want to access GNS to run this process 
+# Do we require users that want to access GNS to run this process
 # (usually not a good idea)
 UNIX_MATCH_UID = NO
 
@@ -28,26 +25,8 @@ BINARY = gnunet-gns-proxy
 AUTOSTART = NO
 
 # Where is the certificate for the GNS proxy stored?
-PROXY_CACERT = $SERVICEHOME/gns/gnsCAcert.pem
-PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock
-
-
-[fcfsd]
-# Name of the fcfs binary (for ARM)
-BINARY = gnunet-gns-fcfsd
-AUTOSTART = NO
-
-# 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
-
-# For ARM, not very useful.  FIXME: Dead option?
-HOSTNAME = localhost
-
-# FIXME: Dead option?
-HOME = $SERVICEHOME
+PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem
+PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
 
 
 [dns2gns]