Commit ead7ad94 authored by Florian Schaal's avatar Florian Schaal

updated installer and updater - detect which and haveged (Fixes: #3843 and #3840)

parent d0e9f82a
......@@ -140,6 +140,8 @@ include_once 'dist/conf/'.$dist['id'].'.conf.php';
//****************************************************************************************************
$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 @@ if($install_mode == 'standard') {
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 @@ if($install_mode == 'standard') {
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']) {
......
......@@ -378,6 +378,9 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
} 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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment