add logic to handle SRV/DANE names (#3003 and 2526) in GNS resolver

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

diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index 303fbf90b6ea560a0b93cd9444f0f1cd25a95629..b9d8cc613c37e8c8788534ea42e8a73767f51629 100644 (file)
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,29 +1,43 @@
 [gns]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-gns
-UNIXPATH = /tmp/gnunet-service-gns.sock
-@UNIXONLY@PORT = 2102
-ZONEKEY = $SERVICEHOME/gns/zonekey.zkey
-PRIVATE_ZONEKEY = $SERVICEHOME/gns/zonekey_priv.zkey
-SHORTEN_ZONEKEY = $SERVICEHOME/gns/zonekey_short.zkey
-HIJACK_DNS = NO
-AUTO_IMPORT_PKEY = YES
-AUTO_IMPORT_CONFIRMATION_REQ = NO
-MAX_PARALLEL_BACKGROUND_QUERIES = 25
-DEFAULT_LOOKUP_TIMEOUT = 10
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-gns.sock
+@JAVAPORT@PORT = 2102
+USER_SERVICE = YES
+
+# 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
+
+# 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]
-PROXY_CACERT = $SERVICEHOME/gns/gnsCAcert.pem
-PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock
+BINARY = gnunet-gns-proxy
+AUTOSTART = NO
+USER_SERVICE = YES
 
-[fcfsd]
-HTTPPORT = 18080
-ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-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
+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