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

[oweals/gnunet.git] / contrib / gnunet-gns-import.sh

diff --git a/contrib/gnunet-gns-import.sh b/contrib/gnunet-gns-import.sh
index 75f84fd0e679f5f55fa59b27eee0bd7aefa8bb65..6353608031d1d9a3def24a80046f650d397418e5 100755 (executable)
--- a/contrib/gnunet-gns-import.sh
+++ b/contrib/gnunet-gns-import.sh
@@ -39,9 +39,8 @@ while getopts "c:" opt; do
   esac
 done
 
-# By default, we create three GNS zones:
+# By default, we create two GNS zones:
 gnunet-identity -C master-zone $options
-gnunet-identity -C short-zone $options
 gnunet-identity -C private-zone $options
 
 # Additionally, we create the FS SKS zone
@@ -66,6 +65,9 @@ gnunet-identity -e master-zone -s gns-proxy $options
 # (remove this entry to disable DNS interception by GNS service)
 gnunet-identity -e master-zone -s gns-intercept $options
 
+# Use master-zone for DNS2GNS proxy.
+gnunet-identity -e master-zone -s dns2gns $options
+
 # 'gns-private' is not yet used (!)
 gnunet-identity -e private-zone -s gns-private $options