fix only cache variable long/short

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

diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index f2aa1c2c6eeded21f066f8376772719656c6c008..b9d8cc613c37e8c8788534ea42e8a73767f51629 100644 (file)
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,80 +1,43 @@
 [gns]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-gns
-UNIXPATH = /tmp/gnunet-service-gns.sock
-@UNIXONLY@PORT = 2102
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-gns.sock
+@JAVAPORT@PORT = 2102
+USER_SERVICE = YES
 
-# Where to store the key for the Master zone
-ZONEKEY = $SERVICEHOME/gns/zonekey.zkey
-
-# Where to store the key for the Private zone
-PRIVATE_ZONEKEY = $SERVICEHOME/gns/zonekey_priv.zkey
-
-# Where to store the key for the Shorten zone
-SHORTEN_ZONEKEY = $SERVICEHOME/gns/zonekey_short.zkey
-
-# Should we hijack DNS queries using the Linux firewall? 
-# (this only works on GNU/Linux systems)
-HIJACK_DNS = NO
-
-# Automatically import PKEYs we learn into the shorten zone?
-AUTO_IMPORT_PKEY = YES
-
-# 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
 
 # Do we require users that want to access GNS to be in the 'gnunet' group?
 UNIX_MATCH_GID = YES
 
-# When we automatically import PKEYs into shorten zone, require confirmation
-# before they become active? (Not useful right now as the GUI to confirm
-# doesn't exist)
-AUTO_IMPORT_CONFIRMATION_REQ = NO
-
-# How many queries is GADS allowed to perform in the background at the same time?
-MAX_PARALLEL_BACKGROUND_QUERIES = 25
-
-# When do queries fail with timeout?
-DEFAULT_LOOKUP_TIMEOUT = 10 s
+# How many queries is GNS allowed to perform in the background at the same time?
+MAX_PARALLEL_BACKGROUND_QUERIES = 1000
 
 # How frequently do we try to publish our full zone?
 ZONE_PUBLISH_TIME_WINDOW = 4 h
 
+# Using caching or always ask DHT
+# USE_CACHE = YES
+
 # PREFIX = valgrind --leak-check=full --track-origins=yes
 
 [gns-proxy]
 BINARY = gnunet-gns-proxy
 AUTOSTART = NO
+USER_SERVICE = YES
 
 # 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]
 BINARY = gnunet-dns2gns
 AUTOSTART = NO
+USER_SERVICE = YES
 
 # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use
 OPTIONS = -d 8.8.8.8