From f353d3c7a464e2047eef93d444db13d9e69aec5c Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Tue, 19 Mar 2013 12:47:56 -0400 Subject: [PATCH] - Fixed FS#2765 - Rename DNS zone make new file, but old is not deleted. --- server/plugins-available/bind_plugin.inc.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index 4dd37fb..e4f6e6c 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -39,7 +39,7 @@ function onInstall() { global $conf; - if(isset($conf['bind']['installed']) && $conf['bind']['installed'] == true) { + if(isset($conf['bind']['installed']) && $conf['bind']['installed'] == true && @is_link('/usr/local/ispconfig/server/mods-enabled/dns_module.inc.php')) { return true; } else { return false; @@ -141,10 +141,10 @@ if($data['old']['origin'] != $data['new']['origin']) { //TODO : change this when distribution information has been integrated into server record if (file_exists('/etc/gentoo-release')) { - $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1)); + $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($data['old']['origin'],0,-1)); } else { - $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1)); + $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($data['old']['origin'],0,-1)); } if(is_file($filename)) unlink($filename); -- Gitblit v1.9.1