From cb3808223b930a50d54e8f8df10e66dd12e1e6bd Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 30 Oct 2009 15:11:50 +0000
Subject: [PATCH]
---
server/conf/bind_named.conf.local.master | 2 ++
server/plugins-available/bind_plugin.inc.php | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/server/conf/bind_named.conf.local.master b/server/conf/bind_named.conf.local.master
index 7815bc29d4..c8eb70f9be 100644
--- a/server/conf/bind_named.conf.local.master
+++ b/server/conf/bind_named.conf.local.master
@@ -1,7 +1,9 @@
<tmpl_loop name='zones'>
+<tmpl_if name='zone'>
zone "<tmpl_var name='zone'>" {
type master;
file "<tmpl_var name='zonefile_path'>";
};
+</tmpl_if>
</tmpl_loop>
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index 87c99a7cdb..4ab9b48cfa 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -134,7 +134,7 @@ class bind_plugin {
$this->write_named_conf($data,$dns_config);
//* Delete the domain file
- $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.$data['old']['origin'];
+ $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.substr($data['old']['origin'],0,-1);
if(is_file($filename)) unset($filename);
$app->log("Deleting BIND domain file: ".$filename,LOGLEVEL_DEBUG);
--
GitLab