-use identity service also for shorten zone lookup

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

diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index e865efd21f5d326fbe9b576f42132b2163e21d34..8625d0f0a038108f628afa87ec25e1fbc124e30c 100644 (file)
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -6,14 +6,10 @@ BINARY = gnunet-service-gns
 UNIXPATH = /tmp/gnunet-service-gns.sock
 @UNIXONLY@PORT = 2102
 
-# Where to store the key for the Master zone
-ZONEKEY = $SERVICEHOME/gns/zonekey.zkey
+ZONE_DIR = $SERVICEHOME/gns/
 
-# 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
+# What is the name of the ego that we use for the shorten zone
+SHORTEN_ZONE = shorten
 
 # Should we hijack DNS queries using the Linux firewall? 
 # (this only works on GNU/Linux systems)
@@ -22,9 +18,16 @@ 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 
+# (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)
+# doesn't exist -- and neither does the API...)
 AUTO_IMPORT_CONFIRMATION_REQ = NO
 
 # How many queries is GADS allowed to perform in the background at the same time?
@@ -39,11 +42,19 @@ ZONE_PUBLISH_TIME_WINDOW = 4 h
 # PREFIX = valgrind --leak-check=full --track-origins=yes
 
 [gns-proxy]
+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
 
@@ -56,6 +67,10 @@ HOSTNAME = localhost
 # FIXME: Dead option?
 HOME = $SERVICEHOME
 
-# Name of the fcfs binary (for ARM)
-BINARY = gnunet-gns-fcfsd
 
+[dns2gns]
+BINARY = gnunet-dns2gns
+AUTOSTART = NO
+
+# -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use
+OPTIONS = -d 8.8.8.8