From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/update.php | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/install/update.php b/install/update.php
index fe08903..4626b50 100644
--- a/install/update.php
+++ b/install/update.php
@@ -137,7 +137,7 @@
//** Include the distribution-specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once 'dist/lib/'.$dist['baseid'].'.lib.php';
include_once 'dist/lib/'.$dist['id'].'.lib.php';
-include_once 'dist/conf/'.$dist['id'].'.conf.php';
+include_once 'dist/conf/'.$dist['confid'].'.conf.php';
//** Get hostname
exec('hostname -f', $tmp_out);
@@ -326,9 +326,9 @@
$inst->configure_postfix('dont-create-certs');
if($conf['dovecot']['installed'] == true) {
- //* Configure dovecot
- swriteln('Configuring Dovecot');
- $inst->configure_dovecot();
+ //* Configure dovecot
+ swriteln('Configuring Dovecot');
+ $inst->configure_dovecot();
} elseif ($conf['courier']['installed'] == true) {
//** Configure saslauthd
swriteln('Configuring SASL');
@@ -378,6 +378,9 @@
} elseif($conf['bind']['installed'] == true) {
swriteln('Configuring BIND');
$inst->configure_bind();
+ if(!is_installed('haveged')) {
+ swriteln("[INFO] haveged not detected - DNSSEC can fail");
+ }
} else {
swriteln('Configuring MyDNS');
$inst->configure_mydns();
--
Gitblit v1.9.1