From 47f5e03bbf38d54922a9c397d4f2770994a03921 Mon Sep 17 00:00:00 2001
From: jwarnier <jwarnier@ispconfig3>
Date: Fri, 24 Sep 2010 21:22:05 -0400
Subject: [PATCH] Use $conf['init_scripts'] instead of calling /etc/init.d/* directly
---
server/mods-available/dns_module.inc.php | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/server/mods-available/dns_module.inc.php b/server/mods-available/dns_module.inc.php
index f079127..4ea5d09 100644
--- a/server/mods-available/dns_module.inc.php
+++ b/server/mods-available/dns_module.inc.php
@@ -117,17 +117,17 @@
function restartBind($action = 'restart') {
global $app;
- $command = '';
- if(is_file('/etc/init.d/bind9')) {
- $command = '/etc/init.d/bind9';
+ $daemon = '';
+ if(is_file($conf['init_scripts'] . '/' . 'bind9')) {
+ $daemon = 'bind9';
} else {
- $command = '/etc/init.d/named';
+ $daemon = 'named';
}
if($action == 'restart') {
- exec($command.' restart');
+ exec($conf['init_scripts'] . '/' . $daemon . ' restart');
} else {
- exec($command.' reload');
+ exec($conf['init_scripts'] . '/' . $daemon . ' reload');
}
}
@@ -166,13 +166,14 @@
*/
file_put_contents('/etc/powerdns/pdns.d/pdns.ispconfig-axfr',$options."\n");
- if (is_file('/etc/init.d/powerdns')) {
- $command = '/etc/init.d/powerdns';
+ daemon= '';
+ if (is_file($conf['init_scripts'] . '/' . 'powerdns')) {
+ $daemon = 'powerdns';
} else {
- $command = '/etc/init.d/pdns';
+ $daemon = 'pdns';
}
- exec($command.' restart');
+ exec($conf['init_scripts'] . '/' . $daemon . ' restart');
// unset $tmps;
--
Gitblit v1.9.1