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

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

diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index 2c1fa9ccc4d66d0255d20a45896af491a57727a4..2e6a02b07c831cf0c9cc5c2ae43c7cf24134d05f 100644 (file)
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,76 +1,47 @@
 [gns]
-AUTOSTART = YES
+START_ON_DEMAND = @START_ON_DEMAND@
+IMMEDIATE_START = YES
 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
 
-ZONE_DIR = $SERVICEHOME/gns/
-
-# 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 GNS allowed to perform in the background at the same time?
+MAX_PARALLEL_BACKGROUND_QUERIES = 1000
 
-# 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 frequently do we try to publish our full zone?
-ZONE_PUBLISH_TIME_WINDOW = 4 h
+# Should we use the DNS interception mechanism?  If set to YES
+# we will ask gnunet-service-dns to pass DNS queries to us. Otherwise,
+# we only answer GNS queries via the API (which itself may be
+# called via NSS or other mechanisms).
+INTERCEPT_DNS = NO
 
 # PREFIX = valgrind --leak-check=full --track-origins=yes
 
+# Zones
+.pin = DWJASSPE33MRN8T6Q0PENRNBTQY0E6ZYGTRCDP5DGPBF2CRJMJEG
+.fr = TFDAXBXMAN40MCG4E8Y9Y1C6D16JCMDPH2VMD30KMB92SECEMYGG
+
 [gns-proxy]
 BINARY = gnunet-gns-proxy
-AUTOSTART = NO
+START_ON_DEMAND = NO
+RUN_PER_USER = 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
+START_ON_DEMAND = NO
+RUN_PER_USER = YES
 
 # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use
 OPTIONS = -d 8.8.8.8