X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fbind.export;h=a3bbd1ac55d590250ec9f99849667395893f99be;hp=d0b93797ec3f7f2ee1f2c1c0ae325849d75127cb;hb=d5109b4395d35a615f36fc7629803c24d489c516;hpb=b8cfd0780aa40bb07f3215bf9cb58011f5e32a35

diff --git a/bin/bind.export b/bin/bind.export
index d0b93797e..a3bbd1ac5 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -43,10 +43,12 @@ foreach my $export ( @exports ) {
   open(NAMED_CONF,">$prefix/named.conf")
     or die "can't open $prefix/named.conf: $!";
 
-  open(CONF_HEADER,"<$prefix/named.conf.HEADER")
-    or die "can't open $prefix/named.conf.HEADER: $!";
-  while (<CONF_HEADER>) { print NAMED_CONF $_; }
-  close CONF_HEADER;
+  if ( -e "$prefix/named.conf.HEADER" ) {
+    open(CONF_HEADER,"<$prefix/named.conf.HEADER")
+      or die "can't open $prefix/named.conf.HEADER: $!";
+    while (<CONF_HEADER>) { print NAMED_CONF $_; }
+    close CONF_HEADER;
+  }
 
   my $zonepath = $export->option('zonepath');
   $zonepath =~ s/\/$//;
@@ -70,6 +72,7 @@ zone "$domain" {
 };
 
 END
+      unlink "$prefix/db.$domain" if -e "$prefix/db.$domain";
 
     } else {
 
@@ -145,10 +148,12 @@ foreach my $sexport ( @sexports ) { #false laziness with above
   open(NAMED_CONF,">$prefix/named.conf")
     or die "can't open $prefix/named.conf: $!";
 
-  open(CONF_HEADER,"<$prefix/named.conf.HEADER")
-    or die "can't open $prefix/named.conf.HEADER: $!";
-  while (<CONF_HEADER>) { print NAMED_CONF $_; }
-  close CONF_HEADER;
+  if ( -e "$prefix/named.conf.HEADER" ) {
+    open(CONF_HEADER,"<$prefix/named.conf.HEADER")
+      or die "can't open $prefix/named.conf.HEADER: $!";
+    while (<CONF_HEADER>) { print NAMED_CONF $_; }
+    close CONF_HEADER;
+  }
 
   my $masters = $sexport->option('master');