Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-11 de7d2617421127b9cc7edeb3b17401246046714b

 install/install.php

@@ -328,17 +328,20 @@
   } 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');