From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 04 May 2016 07:27:53 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 install/install.php |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/install/install.php b/install/install.php
index 374edd7..cff2265 100644
--- a/install/install.php
+++ b/install/install.php
@@ -140,6 +140,8 @@
 //****************************************************************************************************
 $inst = new installer();
 if (!$inst->get_php_version()) die('ISPConfig requieres PHP '.$inst->min_php."\n");
+$retval=shell_exec("which which");
+if (empty($retval)) die ("ISPConfig requieres which \n");
 
 swriteln($inst->lng('    Following will be a few questions for primary configuration so be careful.'));
 swriteln($inst->lng('    Default values are in [brackets] and can be accepted with <ENTER>.'));
@@ -342,11 +344,15 @@
 		$conf['services']['dns'] = true;
 	}
 */
+
 	//* Configure Bind
 	if($conf['bind']['installed']) {
 		swriteln('Configuring BIND');
 		$inst->configure_bind();
 		$conf['services']['dns'] = true;
+		if(!is_installed('haveged')) {
+			swriteln("[INFO] haveged not detected - DNSSEC can fail");
+		}
 	}
 	//* Configure MyDNS
 	if($conf['mydns']['installed']) {
@@ -727,6 +733,9 @@
 			swriteln('Configuring BIND');
 			$inst->configure_bind();
 			$conf['services']['dns'] = true;
+			if(!is_installed('haveged')) {
+				swriteln("[INFO] haveged not detected - DNSSEC can fail");
+			}
 		}
 		//* Configure MyDNS
 		if($conf['mydns']['installed']) {

--
Gitblit v1.9.1