Use $conf['init_scripts'] instead of calling /etc/init.d/* directly

Author: jwarnier

server/mods-available/dns_module.inc.php

@@ -117,17 +117,17 @@ function process($tablename,$action,$data) {
 	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 @@ function restartPowerDNS($action = 'restart') {
 */
 		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;
 

server/mods-available/web_module.inc.php

@@ -83,8 +83,8 @@ class that contains the function functionname.
 		*/
 
 		$app->modules->registerTableHook('web_domain','web_module','process');
-        $app->modules->registerTableHook('ftp_user','web_module','process');
-        $app->modules->registerTableHook('shell_user','web_module','process');
+		$app->modules->registerTableHook('ftp_user','web_module','process');
+		$app->modules->registerTableHook('shell_user','web_module','process');
 		$app->modules->registerTableHook('webdav_user','web_module','process');
 
 		// Register service
@@ -129,21 +129,21 @@ function process($tablename,$action,$data) {
 	function restartHttpd($action = 'restart') {
 		global $app;
 
-		$command = '';
-		if(is_file('/etc/init.d/httpd')) {
-			$command = '/etc/init.d/httpd';
+		$daemon = '';
+		if(is_file($conf['init_scripts'] . '/' . 'httpd')) {
+			$daemon = 'httpd';
 		} else {
-			$command = '/etc/init.d/apache2';
+			$daemon = 'apache2';
 		}
 
 		if($action == 'restart') {
-			exec($command.' restart');
+			exec($conf['init_scripts'] . '/' . $daemon . ' restart');
 		} else {
-			exec($command.' reload');
+			exec($conf['init_scripts'] . '/' . $daemon . ' reload');
 		}
 
 	}
 
 } // end class
 
-?>
+?>