Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 install/update.php

@@ -137,7 +137,7 @@
//** Include the distribution-specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once 'dist/lib/'.$dist['baseid'].'.lib.php';
include_once 'dist/lib/'.$dist['id'].'.lib.php';
include_once 'dist/conf/'.$dist['id'].'.conf.php';
include_once 'dist/conf/'.$dist['confid'].'.conf.php';

//** Get hostname
exec('hostname -f', $tmp_out);
@@ -229,7 +229,7 @@
   if(@mysqli_connect($conf["mysql"]["host"], $conf["mysql"]["admin_user"], $conf["mysql"]["admin_password"])) {
      $finished = true;
   } else {
      swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
      swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
      $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');
   }
} while ($finished == false);
@@ -255,7 +255,7 @@
      $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');

      //* Initialize the MySQL server connection
      if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
      if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
         $conf['mysql']['master_host'] = $tmp_mysql_server_host;
         $conf['mysql']['master_port'] = $tmp_mysql_server_port;
         $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
@@ -263,7 +263,7 @@
         $conf['mysql']['master_database'] = $tmp_mysql_server_database;
         $finished = true;
      } else {
         swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
         swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
      }
   } while ($finished == false);
   unset($finished);
@@ -321,33 +321,34 @@
   if($conf['services']['mail']) {

      //** Configure postfix
      if($inst->reconfigure_app('Postfix', $reconfigure_services_answer)) {
      if($inst->reconfigure_app('Postfix and IMAP/POP3', $reconfigure_services_answer)) {
         swriteln('Configuring Postfix');
         $inst->configure_postfix('dont-create-certs');

         if($conf['dovecot']['installed'] == true) {
            //* Configure dovecot
            swriteln('Configuring Dovecot');
            $inst->configure_dovecot();
         } elseif ($conf['courier']['installed'] == true) {
            //** Configure saslauthd
            swriteln('Configuring SASL');
            $inst->configure_saslauthd();

            //** Configure PAM
            swriteln('Configuring PAM');
            $inst->configure_pam();

            //* Configure courier
            swriteln('Configuring Courier');
            $inst->configure_courier();
         }

      }

      //** Configure mailman
      if($conf['mailman']['installed'] == true && $inst->reconfigure_app('Mailman', $reconfigure_services_answer)) {
         swriteln('Configuring Mailman');
         $inst->configure_mailman('update');
      }

      if($conf['dovecot']['installed'] == true && $inst->reconfigure_app('Dovecot', $reconfigure_services_answer)) {
         //* Configure dovecot
         swriteln('Configuring Dovecot');
         $inst->configure_dovecot();
      } elseif ($conf['courier']['installed'] == true && $inst->reconfigure_app('Courier', $reconfigure_services_answer)) {
         //** Configure saslauthd
         swriteln('Configuring SASL');
         $inst->configure_saslauthd();

         //** Configure PAM
         swriteln('Configuring PAM');
         $inst->configure_pam();

         //* Configure courier
         swriteln('Configuring Courier');
         $inst->configure_courier();
      }

      //** Configure Spamasassin
@@ -377,6 +378,9 @@
      } elseif($conf['bind']['installed'] == true) {
         swriteln('Configuring BIND');
         $inst->configure_bind();
         if(!is_installed('haveged')) {
            swriteln("[INFO] haveged not detected - DNSSEC can fail");
         }
      } else {
         swriteln('Configuring MyDNS');
         $inst->configure_mydns();