Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 install/update.php

@@ -30,6 +30,30 @@

/*
   ISPConfig 3 updater.
	
   -------------------------------------------------------------------------------------
   - Interactive update
   -------------------------------------------------------------------------------------
   run:
	
   php update.php
	
   -------------------------------------------------------------------------------------
   - Noninteractive (autoupdate) mode
   -------------------------------------------------------------------------------------
	
   The autoupdate mode can read the updater questions from a .ini style file or from
   a php config file. Examples for both file types are in the docs folder. 
   See autoinstall.ini.sample and autoinstall.conf_sample.php.
	
   run:
	
   php update.php --autoinstall=autoinstall.ini
	
   or
	
   php update.php --autoinstall=autoinstall.conf.php
	
*/

error_reporting(E_ALL|E_STRICT);
@@ -83,10 +107,37 @@

if($dist['id'] == '') die('Linux distribution or version not recognized.');

//** Include the autoinstaller configuration (for non-interactive setups)
error_reporting(E_ALL ^ E_NOTICE);

//** Get commandline options
$cmd_opt = getopt('', array('autoinstall::'));

//** Load autoinstall file
if(isset($cmd_opt['autoinstall']) && is_file($cmd_opt['autoinstall'])) {
   $path_parts = pathinfo($cmd_opt['autoinstall']);
   if($path_parts['extension'] == 'php') {
      include_once $cmd_opt['autoinstall'];
   } elseif($path_parts['extension'] == 'ini') {
      $tmp = ini_to_array(file_get_contents('autoinstall.ini'));
      if(!is_array($tmp['install'])) $tmp['install'] = array();
      if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array();
      if(!is_array($tmp['expert'])) $tmp['expert'] = array();
      if(!is_array($tmp['update'])) $tmp['update'] = array();
      $autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update'];
      unset($tmp);
   }
   unset($path_parts);
   define('AUTOINSTALL', true);
} else {
   $autoinstall = array();
   define('AUTOINSTALL', false);
}

//** 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);
@@ -123,15 +174,14 @@
$conf['ispconfig_log_priority'] = $conf_old["log_priority"];

$inst = new installer();
if (!$inst->get_php_version()) die('ISPConfig requieres PHP '.$inst->min_php."\n");
$inst->is_update = true;

//** Detect the installed applications
$inst->find_installed_apps();

echo "This application will update ISPConfig 3 on your server.\n\n";

//* Make a backup before we start the update
$do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in /var/backup/ now?', array('yes', 'no'), 'yes');
$do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in /var/backup/ now?', array('yes', 'no'), 'yes','do_backup');

if($do_backup == 'yes') {

   //* Create the backup directory
@@ -176,11 +226,11 @@
//** Test mysql root connection
$finished = false;
do {
   if(@mysql_connect($conf["mysql"]["host"], $conf["mysql"]["admin_user"], $conf["mysql"]["admin_password"])) {
   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').' '.mysql_error());
      $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
      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);
unset($finished);
@@ -198,20 +248,22 @@
   //** Get MySQL root credentials
   $finished = false;
   do {
      $tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']);
      $tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']);
      $tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']);
      $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']);
      $tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host'],'mysql_master_hostname');
      $tmp_mysql_server_port = $inst->free_query('MySQL master server port', $conf['mysql']['master_port'],'mysql_master_port');
      $tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user'],'mysql_master_root_user');	 
      $tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password'],'mysql_master_root_password');
      $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(@mysql_connect($tmp_mysql_server_host, $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;
         $conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;
         $conf['mysql']['master_database'] = $tmp_mysql_server_database;
         $finished = true;
      } else {
         swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
         swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
      }
   } while ($finished == false);
   unset($finished);
@@ -219,10 +271,8 @@
   // initialize the connection to the master database
   $inst->dbmaster = new db();
   if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
   $inst->dbmaster->dbHost = $conf['mysql']["master_host"];
   $inst->dbmaster->dbName = $conf['mysql']["master_database"];
   $inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];
   $inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];
   $inst->dbmaster->setDBData($conf['mysql']["master_host"], $conf['mysql']["master_admin_user"], $conf['mysql']["master_admin_password"]);
   $inst->dbmaster->setDBName($conf['mysql']["master_database"]);
} else {
   $inst->dbmaster = $inst->db;
}
@@ -244,73 +294,83 @@
 */
//if($conf_old['dbmaster_user'] != '' or $conf_old['dbmaster_host'] != '') {
//** Update master database rights
$reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes', 'no'), 'no');
$reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes', 'no'), 'no','reconfigure_permissions_in_master_database');

if($reconfigure_master_database_rights_answer == 'yes') {
   $inst->grant_master_database_rights();
}
//}

//** Shall the services be reconfigured during update
$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no'), 'yes');
//** Detect the installed applications
$inst->find_installed_apps();

if($reconfigure_services_answer == 'yes') {
$conf['services']['mail'] = $conf['postfix']['installed'];
if ($conf['powerdns']['installed'] || $conf['bind']['installed'] || $conf['mydns']['installed']) $conf['services']['dns'] = true;
if ($conf['apache']['installed'] || $conf['nginx']['installed']) $conf['services']['web'] = true;
$conf['services']['xmpp'] =  $conf['xmpp']['installed'];;
if ($conf['ufw']['installed'] || $conf['firewall']['installed']) $conf['services']['firewall'] = true;
$conf['services']['vserver'] = $conf['services']['vserver'];
$conf['services']['db'] = true;


//** Shall the services be reconfigured during update
$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no', 'selected'), 'yes','reconfigure_services');

if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'selected') {

   if($conf['services']['mail']) {

      //** Configure postfix
      swriteln('Configuring Postfix');
      $inst->configure_postfix('dont-create-certs');
      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) {
      if($conf['mailman']['installed'] == true && $inst->reconfigure_app('Mailman', $reconfigure_services_answer)) {
         swriteln('Configuring Mailman');
         $inst->configure_mailman('update');
      }

      //* Configure Jailkit
      swriteln('Configuring Jailkit');
      $inst->configure_jailkit();

      if($conf['dovecot']['installed'] == true) {
         //* Configure dovecot
         swriteln('Configuring Dovecot');
         $inst->configure_dovecot();
      } else {
         //** 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
      if($inst->reconfigure_app('Spamassassin', $reconfigure_services_answer)) {
         swriteln('Configuring Spamassassin');
         $inst->configure_spamassassin();
      }

      //** Configure Spamasassin
      swriteln('Configuring Spamassassin');
      $inst->configure_spamassassin();

      //** Configure Amavis
      if($conf['amavis']['installed'] == true) {
      if($conf['amavis']['installed'] == true && $inst->reconfigure_app('Amavisd', $reconfigure_services_answer)) {
         swriteln('Configuring Amavisd');
         $inst->configure_amavis();
      }

      //** Configure Getmail
      swriteln('Configuring Getmail');
      $inst->configure_getmail();
      if ($inst->reconfigure_app('Getmail', $reconfigure_services_answer)) {
         swriteln('Configuring Getmail');
         $inst->configure_getmail();
      }
   }

   if($conf['services']['web'] && $conf['pureftpd']['installed'] == true) {
      //** Configure Pureftpd
      swriteln('Configuring Pureftpd');
      $inst->configure_pureftpd();
   }

   if($conf['services']['dns']) {
   if($conf['services']['dns'] && $inst->reconfigure_app('DNS', $reconfigure_services_answer)) {
      //* Configure DNS
      if($conf['powerdns']['installed'] == true) {
         swriteln('Configuring PowerDNS');
@@ -318,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();
@@ -325,32 +388,47 @@
   }

   if($conf['services']['web']) {
      if($conf['webserver']['server_type'] == 'apache'){
         //** Configure Apache
         swriteln('Configuring Apache');
         $inst->configure_apache();

         //** Configure vlogger
         swriteln('Configuring vlogger');
         $inst->configure_vlogger();
      } else {
         //** Configure nginx
         swriteln('Configuring nginx');
         $inst->configure_nginx();
      if($conf['pureftpd']['installed'] == true && $inst->reconfigure_app('Pureftpd', $reconfigure_services_answer)) {
         //** Configure Pureftpd
         swriteln('Configuring Pureftpd');
         $inst->configure_pureftpd();
      }

      //** Configure apps vhost
      swriteln('Configuring Apps vhost');
      $inst->configure_apps_vhost();
   }
      if($inst->reconfigure_app('Web-Server', $reconfigure_services_answer)) {
         if($conf['webserver']['server_type'] == 'apache'){
            //** Configure Apache
            swriteln('Configuring Apache');
            $inst->configure_apache();

            //** Configure vlogger
            swriteln('Configuring vlogger');
            $inst->configure_vlogger();
         } else {
            //** Configure nginx
            swriteln('Configuring nginx');
            $inst->configure_nginx();
         }

   //* Configure DBServer
   swriteln('Configuring Database');
   $inst->configure_dbserver();
         //** Configure apps vhost
         swriteln('Configuring Apps vhost');
         $inst->configure_apps_vhost();
         }
	
         //* Configure Jailkit
         if($inst->reconfigure_app('Jailkit', $reconfigure_services_answer)) {
            swriteln('Configuring Jailkit');
            $inst->configure_jailkit();
         }

      }

   if($conf['services']['firewall']) {
    if($conf['services']['xmpp'] && $inst->reconfigure_app('XMPP', $reconfigure_services_answer)) {
        //** Configure Metronome XMPP
        $inst->configure_xmpp('dont-create-certs');
    }

   if($conf['services']['firewall'] && $inst->reconfigure_app('Firewall', $reconfigure_services_answer)) {
      if($conf['ufw']['installed'] == true) {
         //* Configure Ubuntu Firewall
         $conf['services']['firewall'] = true;
@@ -362,6 +440,10 @@
         $inst->configure_bastille_firewall();
      }
   }

   //* Configure DBServer
   swriteln('Configuring Database');
   $inst->configure_dbserver();

   /*
   if($conf['squid']['installed'] == true) {
@@ -386,23 +468,27 @@
if ($conf['services']['web'] && $inst->install_ispconfig_interface) {
   //** Customise the port ISPConfig runs on
   $ispconfig_port_number = get_ispconfig_port_number();
   if($autoupdate['ispconfig_port'] == 'default') $autoupdate['ispconfig_port'] = $ispconfig_port_number;
   if($conf['webserver']['server_type'] == 'nginx'){
      $conf['nginx']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);
      $conf['nginx']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number,'ispconfig_port');
   } else {
      $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);
      $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number,'ispconfig_port');
   }


   // $ispconfig_ssl_default = (is_ispconfig_ssl_enabled() == true)?'y':'n';
   if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate', array('yes', 'no'), 'no')) == 'yes') {
   if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate', array('yes', 'no'), 'no','create_new_ispconfig_ssl_cert')) == 'yes') {
      $inst->make_ispconfig_ssl_cert();
   }
}

$inst->install_ispconfig();

// Cleanup
$inst->cleanup_ispconfig();

//** Configure Crontab
$update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes', 'no'), 'yes');
$update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes', 'no'), 'yes','reconfigure_crontab');
if($update_crontab_answer == 'yes') {
   swriteln('Updating Crontab');
   $inst->install_crontab();
@@ -411,7 +497,7 @@
//** Restart services:
if($reconfigure_services_answer == 'yes') {
   swriteln('Restarting services ...');
   if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart'));
   if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart').' >/dev/null 2>&1');
   if($conf['services']['mail']) {
      if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
      if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
@@ -442,6 +528,10 @@
      if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '') system($inst->getinitcommand($conf['bind']['init_script'], 'restart').' &> /dev/null');
   }

    if($conf['services']['xmpp']) {
        if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
    }

   if($conf['services']['proxy']) {
      // if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['squid']['init_script']))     system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
      if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '') system($inst->getinitcommand($conf['nginx']['init_script'], 'restart').' &> /dev/null');
@@ -452,6 +542,16 @@
   }
}

//* Set default servers
setDefaultServers();

$inst->create_mount_script();

//* Create md5 filelist
$md5_filename = '/usr/local/ispconfig/security/data/file_checksums_'.date('Y-m-d_h-i').'.md5';
exec('find /usr/local/ispconfig -type f -print0 | xargs -0 md5sum > '.$md5_filename . ' 2>/dev/null');
chmod($md5_filename,0700);

echo "Update finished.\n";

?>