Updated version number to 3.0.2.2

tbrehm

2010-06-10 d46d3709a227915f8649bca7f4162ff66a83da41

 install/update.php

@@ -28,8 +28,12 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

/*
   ISPConfig 3 updater.
*/

//** ISPConfig 3 installer.
error_reporting(E_ALL|E_STRICT);

//** The banner on the command line
echo "\n\n".str_repeat('-',80)."\n";
echo " _____ ___________   _____              __ _       
@@ -43,15 +47,19 @@
echo "\n".str_repeat('-',80)."\n";
echo "\n\n>> Update  \n\n";


//** Include the library with the basic installer functions
require_once('lib/install.lib.php');

//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');

//** Installer/updater logfile
//** Ensure that current working directory is install directory
$cur_dir = getcwd();
if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");

//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));

//** Check for ISPConfig 2.x versions
if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
@@ -81,16 +89,33 @@
//** Set the mysql login information
$conf["mysql"]["host"] = $conf_old["db_host"];
$conf["mysql"]["database"] = $conf_old["db_database"];
$conf['mysql']['charset'] = 'utf8';
$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
$conf['language'] = $conf_old['language'];
if($conf['language'] == '{language}') $conf['language'] = 'en';

if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
if(isset($conf_old["dbmaster_user"])) $conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];
if(isset($conf_old["dbmaster_password"])) $conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];

//* Check if this is a master / slave setup
if($conf["mysql"]["master_host"] != '' && $conf["mysql"]["host"] != $conf["mysql"]["master_host"]) {
   $conf['mysql']['master_slave_setup'] = 'y';
}

// Resolve the IP address of the mysql hostname.
if(!$conf['mysql']['ip'] = gethostbyname($conf['mysql']['host'])) die('Unable to resolve hostname'.$conf['mysql']['host']);

$conf['server_id'] = $conf_old["server_id"];
$conf['server_id'] = intval($conf_old["server_id"]);
$conf['ispconfig_log_priority'] = $conf_old["log_priority"];

$inst = new installer();
$inst->is_update = true;

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

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

@@ -105,19 +130,86 @@
   $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
}

//** load the pre update sql script do perform modifications on the database before the database is dumped
if(is_file(ISPC_INSTALL_ROOT."/install/sql/pre_update.sql")) {
   if($conf['mysql']['admin_password'] == '') {
      caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
   } else {
      caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
   }
}

//** export the current database data
if( !empty($conf["mysql"]["admin_password"]) ) {

   system("mysqldump -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." -p".$conf['mysql']['admin_password']." -c -t --add-drop-table --all --quick ".$conf['mysql']['database']." > existing_db.sql");
   system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
}
else {

   system("mysqldump -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." -c -t --add-drop-table --all --quick ".$conf['mysql']['database']." > existing_db.sql");
   system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
}

//** Delete the old database
if(filesize('existing_db.sql') < 30000) die('Possible problem with dumping the database. We will stop here. Please check the file existing_db.sql');

// create a backup copy of the ispconfig database in the root folder
$backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_h-i').'.sql';
copy('existing_db.sql',$backup_db_name);
exec("chmod 700 $backup_db_name");
exec("chown root:root $backup_db_name");


//* initialize the database
$inst->db = new db();

//* initialize the master DB, if we have a multiserver setup
if($conf['mysql']['master_slave_setup'] == 'y') {
      //** 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']);
	
         //* Initialize the MySQL server connection
         if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
            $conf['mysql']['master_host'] = $tmp_mysql_server_host;
            $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());
         }
      } while ($finished == false);
      unset($finished);
		
      // 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"];
} else {
   $inst->dbmaster = $inst->db;
}

//* Update $conf array with values from the server.ini that shall be preserved
$tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
$ini_array = ini_to_array(stripslashes($tmp['config']));

if(count($ini_array) == 0) die('Unable to read server configuration from database.');

$conf['services']['mail'] = ($tmp['mail_server'] == 1)?true:false;
$conf['services']['web'] = ($tmp['web_server'] == 1)?true:false;
$conf['services']['dns'] = ($tmp['dns_server'] == 1)?true:false;
$conf['services']['file'] = ($tmp['file_server'] == 1)?true:false;
$conf['services']['db'] = ($tmp['db_server'] == 1)?true:false;
$conf['services']['vserver'] = ($tmp['vserver_server'] == 1)?true:false;
$conf['postfix']['vmail_mailbox_base'] = $ini_array['mail']['homedir_path'];

//** Delete the old database
if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['mysql']['database']) ) {

   $inst->error('Unable to drop MySQL database: '.$conf['mysql']['database'].'.');
@@ -125,6 +217,15 @@

//** Create the mysql database
$inst->configure_database();

if($conf['mysql']['master_slave_setup'] == 'y') {
   //** Update master database rights
   $reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes','no'),'no');

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

//** empty all databases
$db_tables = $inst->db->getTables();
@@ -137,17 +238,11 @@
//** load old data back into database
if( !empty($conf["mysql"]["admin_password"]) ) {

   system("mysql -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." -p".$conf['mysql']['admin_password']." ".$conf['mysql']['database']." < existing_db.sql");
   system("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < existing_db.sql");
} else {

   system("mysql -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." ".$conf['mysql']['database']." < existing_db.sql");
   system("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
}

// create a backup copy of the ispconfig database in the root folder
$backup_db_name = '/root/ispconfig_db_backup_'.date('Y-m-d').'.sql';
copy('existing_db.sql',$backup_db_name);
exec("chmod 700 $backup_db_name");
exec("chown root:root $backup_db_name");


//** Update server ini
@@ -157,9 +252,11 @@
$tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));

// update the new template with the old values
foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
   foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
      $tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
if(is_array($old_ini_array)) {
   foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
      foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
         $tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
      }
   }
}

@@ -170,61 +267,122 @@
unset($new_ini);


//** Update system ini
$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1");
$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
unset($tmp_server_rec);
$tpl_ini_array = ini_to_array(rf('tpl/system.ini.master'));

// update the new template with the old values
if(is_array($old_ini_array)) {
   foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
      foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
         $tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
      }
   }
}

$new_ini = array_to_ini($tpl_ini_array);
$tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM sys_ini WHERE 1');
if($tmp['number'] == 0) {
   $inst->db->query("INSERT INTO sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
} else {
   $inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
}
unset($old_ini_array);
unset($tpl_ini_array);
unset($new_ini);


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

if($reconfigure_services_answer == 'yes') {
   //** Configure postfix
   $inst->configure_postfix('dont-create-certs');
   
   //* Configure postfix
   swriteln('Configuring Jailkit');
   $inst->configure_jailkit();
   if($conf['services']['mail']) {
      //** Configure postfix
      swriteln('Configuring Postfix');
      $inst->configure_postfix('dont-create-certs');
   
   //** Configure saslauthd
   swriteln('Configuring SASL');
   $inst->configure_saslauthd();
      //* 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 PAM
         swriteln('Configuring PAM');
         $inst->configure_pam();
		
         //* Configure courier
         swriteln('Configuring Courier');
         $inst->configure_courier();
      }

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

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

   //** Configure Amavis
   swriteln('Configuring Amavisd');
   $inst->configure_amavis();

   //** Configure Getmail
   swriteln('Configuring Getmail');
   $inst->configure_getmail();

   //** Configure Pureftpd
   swriteln('Configuring Pureftpd');
   $inst->configure_pureftpd();

   //** Configure MyDNS
   swriteln('Configuring MyDNS');
   $inst->configure_mydns();

   //** Configure Apache
   swriteln('Configuring Apache');
   $inst->configure_apache();
      //** Configure Getmail
      swriteln('Configuring Getmail');
      $inst->configure_getmail();
   }
   
   if($conf['services']['web']) {
      //** Configure Pureftpd
      swriteln('Configuring Pureftpd');
      $inst->configure_pureftpd();
   }
	
   if($conf['services']['dns']) {
      //* Configure DNS
      if($conf['powerdns']['installed'] == true) {
         swriteln('Configuring PowerDNS');
         $inst->configure_powerdns();
      } elseif($conf['bind']['installed'] == true) {
         swriteln('Configuring BIND');
         $inst->configure_bind();
      } else {
         swriteln('Configuring MyDNS');
         $inst->configure_mydns();
      }
   }
	
   if($conf['services']['web']) {
      //** Configure Apache
      swriteln('Configuring Apache');
      $inst->configure_apache();
        
        //** Configure vlogger
        swriteln('Configuring vlogger');
        $inst->configure_vlogger();
		
      //** Configure apps vhost
      swriteln('Configuring Apps vhost');
      $inst->configure_apps_vhost();
   }
	

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

   
   //if(@is_dir('/etc/Bastille')) {
      //* Configure Firewall
      swriteln('Configuring Firewall');
      $inst->configure_firewall();
   //* Configure Firewall
   swriteln('Configuring Firewall');
   $inst->configure_firewall();
   //}
}

@@ -247,19 +405,28 @@
//** Restart services:
if($reconfigure_services_answer == 'yes') {
   swriteln('Restarting services ...');
   system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
   system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
   if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script']))               system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
   if($conf['services']['mail']) {
      if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script']))            system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
      if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))         system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
      if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script']))               system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
      if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script']))               system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
      if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
      if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap']))          system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
      if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl']))    system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
      if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop']))             system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
      if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl']))       system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
      if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script']))       system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
   }
   if($conf['services']['web']) {
      if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
      if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))            system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   }
   if($conf['services']['dns']) {
      if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script']))               system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
      if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script']))               system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
      if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script']))               system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
   }
}

echo "Update finished.\n";