# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1558303804 -7200
# Node ID 3dd91b8a9ab11f76fbd46c23cc7499d51efafd3d
# Parent  80fc257c99dc4b529aaecdde05d5818e184ef876# Parent  4e07b815084bc1d5a5db6a29974e824d5f55b08e
Merge git://21.41.41.1.ip4.ano/resdb

diff -r 80fc257c99dc -r 3dd91b8a9ab1 scripts/nameserver_autogen/bind_tld_zonefile.sh
--- a/scripts/nameserver_autogen/bind_tld_zonefile.sh	Sun Dec 02 23:01:26 2018 +0000
+++ b/scripts/nameserver_autogen/bind_tld_zonefile.sh	Mon May 20 00:10:04 2019 +0200
@@ -16,13 +16,13 @@
 DOM="3.7.f.6.9.3.e.1.3.6.d.f.ip6.arpa"
 RDNS_ZONEFILE="$ZONEFILE_DIR/$DOM"
 
-echo -n 'generating IPv6 reverse lookup zonefile for...' >&2
+echo -n 'generating IPv6 reverse lookup zonefile for' $DOM '...' >&2
 echo "; this zonefile generated on: `date -u`" > "$RDNS_ZONEFILE".tmp
 echo '$TTL 3600' >> "$RDNS_ZONEFILE".tmp
 echo '$ORIGIN' $DOM. >> "$RDNS_ZONEFILE".tmp
-echo '@ IN SOA @ root ('`date -u +" %Y%m%d%H"`' 60 300 3600000 3600 )' >> "$RDNS_ZONEFILE".tmp
-echo '@ IN NS  @' >> "$RDNS_ZONEFILE".tmp
-echo '@ IN A   127.0.0.1' >> "$RDNS_ZONEFILE".tmp
+echo $DOM. 'IN SOA' $DOM. 'root ('`date -u +" %Y%m%d%H"`' 60 300 3600000 3600 )' >> "$RDNS_ZONEFILE".tmp
+echo $DOM. 'IN NS ' $DOM. >> "$RDNS_ZONEFILE".tmp
+echo $DOM. 'IN A   127.0.0.1' >> "$RDNS_ZONEFILE".tmp
 cd $RESDB_PATH/db/ip6/F/D/6/3/1/E/3/9/6/F/7/3/
 for i in  */*/*/*/ns/*;do
  a=$(printf "%s\n" "$i" | cut -d/ -f1-4 | tr '/' '.' | rev)
@@ -55,9 +55,9 @@
  echo "; this zonefile genreated on: `date -u`" > "$RDNS_ZONEFILE".tmp
  echo '$TTL 3600' >> "$RDNS_ZONEFILE".tmp
  echo '$ORIGIN' $DOM. >> "$RDNS_ZONEFILE".tmp
- echo '@ IN SOA @ root ('`date -u +" %Y%m%d%H"`' 60 300 3600000 3600 )' >> "$RDNS_ZONEFILE".tmp
- echo '@ IN NS  @' >> "$RDNS_ZONEFILE".tmp
- echo '@ IN A   127.0.0.1' >> "$RDNS_ZONEFILE".tmp
+ echo $DOM. 'IN SOA' $DOM. 'root ('`date -u +" %Y%m%d%H"`' 60 300 3600000 3600 )' >> "$RDNS_ZONEFILE".tmp
+ echo $DOM. 'IN NS ' $DOM. >> "$RDNS_ZONEFILE".tmp
+ echo $DOM. 'IN A   127.0.0.1' >> "$RDNS_ZONEFILE".tmp
 
  for i in */*/ns/*;do
   [ -e "$i" ] || continue
@@ -82,9 +82,9 @@
  echo "; this zonefile genreated on: `date -u`" > "$ANO_ZONEFILE".tmp
  echo '$TTL 3600' >> "$ANO_ZONEFILE".tmp
  echo '$ORIGIN' $TLD. >> "$ANO_ZONEFILE".tmp
- echo '@ IN SOA @ root ('`date -u +" %Y%m%d%H"`' 60 300 3600000 3600 )' >> "$ANO_ZONEFILE".tmp
- echo '@ IN NS  @' >> "$ANO_ZONEFILE".tmp
- echo '@ IN A   127.0.0.1' >> "$ANO_ZONEFILE".tmp
+ echo $TLD. 'IN SOA' $TLD. 'root ('`date -u +" %Y%m%d%H"`' 60 300 3600000 3600 )' >> "$ANO_ZONEFILE".tmp
+ echo $TLD. 'IN NS ' $TLD. >> "$ANO_ZONEFILE".tmp
+ echo $TLD. 'IN A   127.0.0.1' >> "$ANO_ZONEFILE".tmp
 
  for name in *;do
   if [ -d "$name/ns" ];then
diff -r 80fc257c99dc -r 3dd91b8a9ab1 scripts/nameserver_autogen/bind_tld_zonefile_all.sh
--- a/scripts/nameserver_autogen/bind_tld_zonefile_all.sh	Sun Dec 02 23:01:26 2018 +0000
+++ b/scripts/nameserver_autogen/bind_tld_zonefile_all.sh	Mon May 20 00:10:04 2019 +0200
@@ -1,8 +1,8 @@
 #!/bin/sh
 # be sure to set these variables first.
-#ANO_ZONEFILE=/etc/namedb/ano
-#RDNS_ZONEFILE=/etc/namedb/21.in-addr.arpa
-#RESDB_PATH=/services/resdb/resdb
+#export ANO_ZONEFILE=/etc/namedb/ano
+#export RDNS_ZONEFILE=/etc/namedb/21.in-addr.arpa
+#export RESDB_PATH=/services/resdb/resdb
 if [ ! "$ANO_ZONEFILE" ];then
  echo "You forgot to set some variables. read the source plzkthx." >&2
  exit 1