From 8ec5ab5eb9627b5968e6b52a98ff47d228de864a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 25 Apr 2016 09:06:44 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
install/install.php | 8 ++++++++
install/update.php | 3 +++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/install/install.php b/install/install.php
index 374edd7..1d0e515 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>.'));
@@ -347,6 +349,9 @@
swriteln('Configuring BIND');
$inst->configure_bind();
$conf['services']['dns'] = true;
+ if(!$inst->find_installed_apps('haveged')) {
+ swriteln("[INFO] haveged not detected - DNSSEC can fail");
+ }
}
//* Configure MyDNS
if($conf['mydns']['installed']) {
@@ -727,6 +732,9 @@
swriteln('Configuring BIND');
$inst->configure_bind();
$conf['services']['dns'] = true;
+ if(!$inst->find_installed_apps('haveged')) {
+ swriteln("[INFO] haveged not detected - DNSSEC can fail");
+ }
}
//* Configure MyDNS
if($conf['mydns']['installed']) {
diff --git a/install/update.php b/install/update.php
index 8f818df..2dcb53d 100644
--- a/install/update.php
+++ b/install/update.php
@@ -378,6 +378,9 @@
} elseif($conf['bind']['installed'] == true) {
swriteln('Configuring BIND');
$inst->configure_bind();
+ if(!$inst->find_installed_apps('haveged')) {
+ swriteln("[INFO] haveged not detected - DNSSEC can fail");
+ }
} else {
swriteln('Configuring MyDNS');
$inst->configure_mydns();
--
Gitblit v1.9.1