Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-04 f6513f0be58f1dd441f3778f8a9d259bbc7267e4

Merge branch 'master' into 'stable-3.1'

Fixes: #3873



See merge request !335

 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");
            }
        }

 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 {