From 5152e9a75e6e0ed4dc26358e4e608ce684147b32 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 26 Apr 2016 03:01:50 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/install.php | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/install/install.php b/install/install.php
index 6334c28..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>.'));
@@ -328,22 +330,28 @@
} else swriteln('[ERROR] Postfix not installed - skipping Mail');
//* Check for DNS
- if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
- $conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
+// if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
+ if(!$conf['bind']['installed'] && !$conf['mydns']['installed']) {
+// $conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
$conf['bind']['installed'] = $inst->force_configure_app('BIND', false);
$conf['mydns']['installed'] = $inst->force_configure_app('MyDNS', false);
}
//* Configure PowerDNS
+/*
if($conf['powerdns']['installed']) {
swriteln('Configuring PowerDNS');
$inst->configure_powerdns();
$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')) {
+ swriteln("[INFO] haveged not detected - DNSSEC can fail");
+ }
}
//* Configure MyDNS
if($conf['mydns']['installed']) {
@@ -445,6 +453,7 @@
swriteln('Configuring Bastille Firewall');
$inst->configure_bastille_firewall();
$conf['services']['firewall'] = true;
+ $conf['bastille']['installed'] = true;
}
//* Configure Fail2ban
@@ -723,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']) {
--
Gitblit v1.9.1