From f6513f0be58f1dd441f3778f8a9d259bbc7267e4 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 04 May 2016 01:52:57 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
install/install.php | 5 +++--
install/update.php | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/install/install.php b/install/install.php
index 1d0e515..cff2265 100644
--- a/install/install.php
+++ b/install/install.php
@@ -344,12 +344,13 @@
$conf['services']['dns'] = true;
}
*/
+
//* Configure Bind
if($conf['bind']['installed']) {
swriteln('Configuring BIND');
$inst->configure_bind();
$conf['services']['dns'] = true;
- if(!$inst->find_installed_apps('haveged')) {
+ if(!is_installed('haveged')) {
swriteln("[INFO] haveged not detected - DNSSEC can fail");
}
}
@@ -732,7 +733,7 @@
swriteln('Configuring BIND');
$inst->configure_bind();
$conf['services']['dns'] = true;
- if(!$inst->find_installed_apps('haveged')) {
+ if(!is_installed('haveged')) {
swriteln("[INFO] haveged not detected - DNSSEC can fail");
}
}
diff --git a/install/update.php b/install/update.php
index 2dcb53d..94de945 100644
--- a/install/update.php
+++ b/install/update.php
@@ -378,7 +378,7 @@
} elseif($conf['bind']['installed'] == true) {
swriteln('Configuring BIND');
$inst->configure_bind();
- if(!$inst->find_installed_apps('haveged')) {
+ if(!is_installed('haveged')) {
swriteln("[INFO] haveged not detected - DNSSEC can fail");
}
} else {
--
Gitblit v1.9.1