Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

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