Updated version number to 3.0.2.2

tbrehm

2010-06-10 d46d3709a227915f8649bca7f4162ff66a83da41

 install/update.php

@@ -53,6 +53,10 @@
//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');

//** 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__).'/../'));
@@ -96,6 +100,11 @@
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']);

@@ -133,20 +142,64 @@
//** 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']);
}

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;
@@ -165,6 +218,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();

@@ -181,12 +243,6 @@

   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_h-i').'.sql';
copy('existing_db.sql',$backup_db_name);
exec("chmod 700 $backup_db_name");
exec("chown root:root $backup_db_name");


//** Update server ini
@@ -251,18 +307,24 @@
      //* Configure Jailkit
      swriteln('Configuring Jailkit');
      $inst->configure_jailkit();
	
      //** Configure saslauthd
      swriteln('Configuring SASL');
      $inst->configure_saslauthd();
	
      //** Configure PAM
      swriteln('Configuring PAM');
      $inst->configure_pam();

      //** Configure courier
      swriteln('Configuring Courier');
      $inst->configure_courier();
      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
      swriteln('Configuring Spamassassin');
@@ -284,15 +346,31 @@
   }
   
   if($conf['services']['dns']) {
      //** Configure MyDNS
      swriteln('Configuring MyDNS');
      $inst->configure_mydns();
      //* 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();
   }
   

@@ -327,24 +405,27 @@
//** Restart services:
if($reconfigure_services_answer == 'yes') {
   swriteln('Restarting services ...');
   if($conf['mysql']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mysql']['init_script']))               system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
   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_file($conf['init_scripts'].'/'.$conf['postfix']['init_script']))            system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
      if($conf['saslauthd']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))         system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
      if($conf['amavis']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['amavis']['init_script']))               system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
      if($conf['clamav']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['clamav']['init_script']))               system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
      if($conf['courier']['courier-authdaemon'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
      if($conf['courier']['courier-imap'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap']))          system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
      if($conf['courier']['courier-imap-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl']))    system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
      if($conf['courier']['courier-pop'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop']))             system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
      if($conf['courier']['courier-pop-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl']))       system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
      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_file($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
      if($conf['pureftpd']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))            system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
      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']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mydns']['init_script']))               system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
      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');
   }
}