Added CAA records

[nsc-5.git] / m4 / mkconf.m4

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index 927ea9e8f851feb659b2ec87cc1545db3f027c77..befb3066acbc65ff0e1cea69e2c49a965325e330 100644 (file)
--- a/m4/mkconf.m4
+++ b/m4/mkconf.m4
@@ -8,7 +8,7 @@ include(m4/dnslib.m4)
 
 define(`DO_PRIMARY', `divert(0)zone "$1" in {
        type master;
 
 define(`DO_PRIMARY', `divert(0)zone "$1" in {
        type master;

-       file "ZONEDIR/nsc_file_name($2)";
+       file "zone/nsc_file_name($2)";

 ZZ_OPTIONS()dnl
 };
 
 ZZ_OPTIONS()dnl
 };
 


@@ -21,7 +21,7 @@ define(`REVERSE', `DO_PRIMARY(REV($1),nsc_if_v6($1,`nsc_revblock6($1)',`nsc_reva
 
 define(`SECONDARY', `divert(0)zone "$1" in {
        type slave;
 
 define(`SECONDARY', `divert(0)zone "$1" in {
        type slave;

-       file "BAKDIR/nsc_file_name($1)";
+       file "bak/nsc_file_name($1)";

        masters { $2; };
 ZZ_OPTIONS()dnl
 };
        masters { $2; };
 ZZ_OPTIONS()dnl
 };


@@ -48,15 +48,6 @@ define(`BLACKHOLE', `divert(0)zone "$1" in {
 
 divert(-1)')
 
 
 divert(-1)')
 

-# Root hint zone
-
-define(`ROOTHINT', `divert(0)zone "." in {
-       type hint;
-       file "ROOTCACHE";
-};
-
-divert(-1)')
-

 # Manual insertion of config file material
 
 define(`CONFIG', `divert(0)$1
 # Manual insertion of config file material
 
 define(`CONFIG', `divert(0)$1