changeset 358:f316fd5e13bf draft

Merge branch 'master' of git://git1.somerandomnick.ano Conflicts: db/as/62487/owner
author Ivo Smits <Ivo@UCIS.nl>
date Wed, 12 Jan 2011 14:24:42 +0100
parents bab50350aeee (diff) 2f379a0b6461 (current diff)
children e70f56fcb80b
files db/as/62487/owner
diffstat 4 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/1984/ns/ns.1984.ano	Wed Jan 12 14:24:42 2011 +0100
@@ -0,0 +1,1 @@
+1.9.8.4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/7B/cidr	Wed Jan 12 14:24:42 2011 +0100
@@ -0,0 +1,1 @@
+1.1.123.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/7B/owner	Wed Jan 12 14:24:42 2011 +0100
@@ -0,0 +1,1 @@
+atiti
--- a/scripts/nameserver_autogen/bind_tld_zonefile	Wed Jan 12 07:20:11 2011 +0000
+++ b/scripts/nameserver_autogen/bind_tld_zonefile	Wed Jan 12 14:24:42 2011 +0100
@@ -8,11 +8,14 @@
  $servers = scandir($name.'/ns/');
  foreach ($servers as $server) {
   if ($server[0] == '.') continue;
-  print($name.' IN NS '.$server."\n");
+  if (substr($name, -4) == ".ano") $name .= ".";
+  $fqserver = $server;
+  if (substr($server, -4) == ".ano") $fqserver .= ".";
+  print($name.' IN NS '.$fqserver."\n");
   $ips = file($name.'/ns/'.$server, FILE_IGNORE_NEW_LINES |
    FILE_SKIP_EMPTY_LINES);
   foreach ($ips as $ip) {
-   print($server.' IN A '.$ip."\n");
+   print($fqserver.' IN A '.$ip."\n");
   }
  }
 }