Merge branch 'master' into 'master'

add suport for Red Hat Software Collections and named-chroot

These patches will add suport for newer Apache webserver from Red Hat Software collections as well as support for running bind in chroot environments.

See merge request !509

Author: Till Brehm

server/mods-available/dns_module.inc.php

@@ -126,6 +126,10 @@ function restartBind($action = 'restart') {
 		$daemon = '';
 		if(is_file($conf['init_scripts'] . '/' . 'bind9')) {
 			$daemon = 'bind9';
+		}elseif(is_file($conf['init_scripts'] . '/' . 'named-chroot')) {
+			$daemon = 'named-chroot';
+		}elseif(is_file('/usr/lib/systemd/system/named-chroot.service')) {
+			$daemon = 'named-chroot';
 		} else {
 			$daemon = 'named';
 		}

server/mods-available/web_module.inc.php

@@ -203,7 +203,9 @@ function restartHttpd($action = 'restart') {
 			$daemon = $web_config['server_type'];
 			break;
 		default:
-			if(is_file($conf['init_scripts'] . '/' . 'httpd') || is_dir('/etc/httpd')) {
+			if(is_file($conf['init_scripts'] . '/' . 'httpd24-httpd') || is_dir('/opt/rh/httpd24/root/etc/httpd') {
+				$daemon = 'httpd24-httpd';
+			} elseif(is_file($conf['init_scripts'] . '/' . 'httpd') || is_dir('/etc/httpd')) {
 				$daemon = 'httpd';
 			} else {
 				$daemon = 'apache2';