Marius Burkard
2016-05-23 9376d70f0ccba49ead95ef47f0ecba568ea2d6e1
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>.'));
@@ -328,22 +330,29 @@
   } 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');
      $inst->configure_bind();
      $conf['services']['dns'] = true;
      if(!is_installed('haveged')) {
         swriteln("[INFO] haveged not detected - DNSSEC can fail");
      }
   }
   //* Configure MyDNS
   if($conf['mydns']['installed']) {
@@ -724,6 +733,9 @@
         swriteln('Configuring BIND');
         $inst->configure_bind();
         $conf['services']['dns'] = true;
         if(!is_installed('haveged')) {
            swriteln("[INFO] haveged not detected - DNSSEC can fail");
         }
      }
      //* Configure MyDNS
      if($conf['mydns']['installed']) {