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

Florian Schaal

2016-04-25 ead7ad94d44af803502cebcf2f08ca815ee7d737

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

 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']) {

 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();