diff --git a/server/mods-available/dns_module.inc.php b/server/mods-available/dns_module.inc.php index f079127bab5f5dd1a112483ae53467f567bce683..4ea5d0957bb3a4e39b6960c6130fb9ea8bf0779e 100644 --- a/server/mods-available/dns_module.inc.php +++ b/server/mods-available/dns_module.inc.php @@ -117,17 +117,17 @@ class dns_module { 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 @@ class dns_module { */ 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; diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php index eeae0920e21cf4a4c54d2f4ac81842bcc9bf50da..1ec10be9c847ef6d990031fb2e2cb814c798f0ae 100644 --- a/server/mods-available/web_module.inc.php +++ b/server/mods-available/web_module.inc.php @@ -83,8 +83,8 @@ class web_module { */ $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 @@ class web_module { 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 -?> \ No newline at end of file +?>