From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.
---
server/mods-available/dns_module.inc.php | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/mods-available/dns_module.inc.php b/server/mods-available/dns_module.inc.php
index 4ea5d09..01c4526 100644
--- a/server/mods-available/dns_module.inc.php
+++ b/server/mods-available/dns_module.inc.php
@@ -47,7 +47,11 @@
function onInstall() {
global $conf;
- return true;
+ if($conf['services']['dns'] == true) {
+ return true;
+ } else {
+ return false;
+ }
}
@@ -115,7 +119,7 @@
function restartBind($action = 'restart') {
- global $app;
+ global $app,$conf;
$daemon = '';
if(is_file($conf['init_scripts'] . '/' . 'bind9')) {
@@ -133,7 +137,7 @@
}
function restartPowerDNS($action = 'restart') {
- global $app;
+ global $app,$conf;
$app->log("restartPDNS called.",LOGLEVEL_DEBUG);
@@ -166,7 +170,7 @@
*/
file_put_contents('/etc/powerdns/pdns.d/pdns.ispconfig-axfr',$options."\n");
- daemon= '';
+ $daemon= '';
if (is_file($conf['init_scripts'] . '/' . 'powerdns')) {
$daemon = 'powerdns';
} else {
--
Gitblit v1.9.1