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 8484f1810d524b64f0ec332a3e1140bf60d904f3..2e6a02b07c831cf0c9cc5c2ae43c7cf24134d05f 100644 (file)
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,29 +1,47 @@
 [gns]
-AUTOSTART = YES
+START_ON_DEMAND = @START_ON_DEMAND@
+IMMEDIATE_START = YES
 HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-gns
-UNIXPATH = /tmp/gnunet-service-gns.sock
-ZONEKEY = $SERVICEHOME/gns/zonekey.zkey
-HIJACK_DNS = NO
-AUTO_IMPORT_PKEY = YES
-AUTO_IMPORT_ZONEKEY = $SERVICEHOME/gns/shorten_zonekey.zkey
-AUTO_IMPORT_CONFIRMATION_REQ = NO
-MAX_PARALLEL_BACKGROUND_QUERIES = 25
-DEFAULT_LOOKUP_TIMEOUT = 10
-RECORD_PUT_INTERVAL = 60
-ZONE_PUT_INTERVAL = 900
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-gns.sock
+@JAVAPORT@PORT = 2102
+
+# 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
+
+# How many queries is GNS allowed to perform in the background at the same time?
+MAX_PARALLEL_BACKGROUND_QUERIES = 1000
+
+# 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]
-PROXY_CACERT = $SERVICEHOME/gns/gnsCAcert.pem
-PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock
+BINARY = gnunet-gns-proxy
+START_ON_DEMAND = NO
+RUN_PER_USER = YES
 
-[fcfsd]
-HTTPPORT = 18080
-ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-gns-fcfsd
+# Where is the certificate for the GNS proxy stored?
+PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem
+PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
+
+
+[dns2gns]
+BINARY = gnunet-dns2gns
+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