From 465c9ed0e2b23d50c4341be17255e9efde4ec1a0 Mon Sep 17 00:00:00 2001 From: vogelor Date: Mon, 10 May 2010 13:47:31 +0000 Subject: [PATCH] Changed the setup !important we have to check this if all works fine! --- install/autoupdate.php | 298 ++++++++++++++++++ install/lib/installer_base.lib.php | 130 ++++---- install/lib/update.lib.php | 154 +++++++++ install/update.php | 135 ++------ .../web/admin/lib/lang/de_remote_action.lng | 2 + .../web/admin/lib/lang/en_remote_action.lng | 4 +- .../web/admin/remote_action_ispcupdate.php | 99 ++++++ .../templates/remote_action_ispcupdate.htm | 25 ++ .../remoteaction_core_module.inc.php | 27 ++ 9 files changed, 698 insertions(+), 176 deletions(-) create mode 100644 install/autoupdate.php create mode 100644 install/lib/update.lib.php create mode 100644 interface/web/admin/remote_action_ispcupdate.php create mode 100644 interface/web/admin/templates/remote_action_ispcupdate.htm diff --git a/install/autoupdate.php b/install/autoupdate.php new file mode 100644 index 000000000..7ab617d11 --- /dev/null +++ b/install/autoupdate.php @@ -0,0 +1,298 @@ +>This script is for internal use only! Please use update.php! \n\n"; + exit; +} + +//** Include the library with the basic installer functions +require_once('lib/install.lib.php'); + +//** Include the library with the basic updater functions +require_once('lib/update.lib.php'); + +//** 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__).'/../')); + +//** Get distribution identifier +$dist = get_distname(); + +if($dist['id'] == '') die('Linux Dustribution or Version not recognized.'); + +//** 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("/usr/local/ispconfig/server/lib/config.inc.php"); +$conf_old = $conf; +unset($conf); + +//** Get hostname +exec('hostname -f', $tmp_out); +$conf['hostname'] = $tmp_out[0]; +unset($tmp_out); + +//** 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 +$conf['mysql']['master_slave_setup'] = 'n'; +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'] = 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(); + +//** Initialize the MySQL server connection +include_once('lib/mysql.lib.php'); + +//** Database update is a bit brute force and should be rebuild later ;) + +/* + * Try to read the DB-admin settings +*/ +$clientdb_host = ''; +$clientdb_user = ''; +$clientdb_password = ''; +include_once("/usr/local/ispconfig/server/lib/mysql_clientdb.conf"); +$conf["mysql"]["admin_user"] = $clientdb_user; +$conf["mysql"]["admin_password"] = $clientdb_password; +$clientdb_host = ''; +$clientdb_user = ''; +$clientdb_password = ''; + +//** There is a error if user for mysql admin_password if empty +if( empty($conf["mysql"]["admin_password"]) ) { + die("internal error - MYSQL-Root passord not known"); +} + +/* + * Prepare the dump of the database +*/ +prepareDBDump(); + +//* initialize the database +$inst->db = new db(); + +/* + * If it is NOT a master-slave - Setup then we are at the Master-DB. So set all rights +*/ +if($conf['mysql']['master_slave_setup'] != 'y') { + $inst->dbmaster = $inst->db; + $inst->grant_master_database_rights(); +echo "done rights"; +} + +/* + * dump the new Database and reconfigure the server.ini +*/ +updateDbAndIni(); + +/* + * Reconfigure all Services +*/ +if($conf['services']['mail'] == true) { + //** Configure postfix + swriteln('Configuring Postfix'); + $inst->configure_postfix('dont-create-certs'); + + //* Configure Jailkit + swriteln('Configuring Jailkit'); + $inst->configure_jailkit(); + + //** Configure saslauthd + swriteln('Configuring SASL'); + $inst->configure_saslauthd(); + + //** Configure PAM + swriteln('Configuring PAM'); + $inst->configure_pam(); + + if($conf['dovecot']['installed'] == true) { + //* Configure dovecot + swriteln('Configuring Dovecot'); + $inst->configure_dovecot(); + } else { + //* Configure courier + swriteln('Configuring Courier'); + $inst->configure_courier(); + } + + //** Configure Spamasassin + swriteln('Configuring Spamassassin'); + $inst->configure_spamassassin(); + + //** Configure Amavis + swriteln('Configuring Amavisd'); + $inst->configure_amavis(); + + //** Configure Getmail + swriteln('Configuring Getmail'); + $inst->configure_getmail(); +} + +if($conf['services']['web'] == true) { + //** Configure Pureftpd + swriteln('Configuring Pureftpd'); + $inst->configure_pureftpd(); +} + +if($conf['services']['dns'] == true) { + //* 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'] == true) { + //** 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 Database'); +$inst->configure_dbserver(); + + +//if(@is_dir('/etc/Bastille')) { +//* Configure Firewall +swriteln('Configuring Firewall'); +$inst->configure_firewall(); +//} + +//** Configure ISPConfig +swriteln('Updating ISPConfig'); + + +//** Customise the port ISPConfig runs on +$conf['apache']['vhost_port'] = '8080'; + +$inst->install_ispconfig(); + +//** Configure Crontab +swriteln('Updating Crontab'); +$inst->install_crontab(); + +//** Restart services: +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['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['dovecot']['init_script'] != '' && is_file($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['services']['dns']) { + if($conf['mydns']['installed'] == true && $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['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_file($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_file($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null'); +} + +echo "Update finished.\n"; + +?> \ No newline at end of file diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index bc82a2eff..78423e915 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -262,102 +262,116 @@ class installer_base { public function grant_master_database_rights() { global $conf; - if($conf['mysql']['master_slave_setup'] != 'y') return; - - //* insert the ispconfig user in the remote server - $from_host = $conf['hostname']; - $from_ip = gethostbyname($conf['hostname']); + /* + * The following code is a little bit tricky: + * * If we HAVE a master-slave - Setup then the client has to grant the rights for himself + * at the master. + * * If we DO NOT have a master-slave - Setup then we have two possibilities + * 1) it is a single server + * 2) it is the MASTER of n clients + */ + if($conf['mysql']['master_slave_setup'] == 'y') { + /* + * it is a master-slave - Setup so the slave has to grant its rights in the master + * database + */ - //* Delete ISPConfig user in the master database, in case that it exists - $this->dbmaster->query("DELETE FROM mysql.user WHERE User = '".$conf['mysql']['master_ispconfig_user']."' AND Host = '".$from_host."';"); - $this->dbmaster->query("DELETE FROM mysql.db WHERE Db = '".$conf['mysql']['master_database']."' AND Host = '".$from_host."';"); - $this->dbmaster->query("DELETE FROM mysql.user WHERE User = '".$conf['mysql']['master_ispconfig_user']."' AND Host = '".$from_ip."';"); - $this->dbmaster->query("DELETE FROM mysql.db WHERE Db = '".$conf['mysql']['master_database']."' AND Host = '".$from_ip."';"); - $this->dbmaster->query('FLUSH PRIVILEGES;'); + //* insert the ispconfig user in the remote server + $from_host = $conf['hostname']; + $from_ip = gethostbyname($conf['hostname']); + + $hosts[$from_host]['user'] = $conf['mysql']['master_ispconfig_user']; + $hosts[$from_host]['db'] = $conf['mysql']['master_database']; + + $hosts[$from_ip]['user'] = $conf['mysql']['master_ispconfig_user']; + $hosts[$from_ip]['db'] = $conf['mysql']['master_database']; + } else{ + /* + * it is NOT a master-slave - Setup so we have to find out all clients and their + * host + */ + $query = "SELECT Host, User FROM mysql.user WHERE User like 'ispcsrv%' ORDER BY User, Host"; + $data = $this->dbmaster->queryAllRecords($query); + if($data === false) { + $this->error('Unable to get the user rights: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); + } + foreach ($data as $item){ + $hosts[$item['Host']]['user'] = $item['User']; + $hosts[$item['Host']]['db'] = $conf['mysql']['master_database']; + } + } - $hosts = array($from_host, $from_ip); + foreach($hosts as $host => $value) { + /* + * Delete ISPConfig user in the master database, in case that it exists + */ + $query = "REVOKE ALL PRIVILEGES, GRANT OPTION FROM '".$value['user']."'@'".$host."' "; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to remove rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); + } - foreach($hosts as $src_host) { //* Create the ISPConfig database user in the remote database - $query = "GRANT SELECT ON ".$conf['mysql']['master_database'].".`server` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT ON ".$value['db'].".`server` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - $query = "GRANT SELECT, INSERT ON ".$conf['mysql']['master_database'].".`sys_log` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT, INSERT ON ".$value['db'].".`sys_log` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - $query = "GRANT SELECT, UPDATE(`status`) ON ".$conf['mysql']['master_database'].".`sys_datalog` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT, UPDATE(`status`) ON ".$value['db'].".`sys_datalog` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - $query = "GRANT SELECT, UPDATE(`status`) ON ".$conf['mysql']['master_database'].".`software_update_inst` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT, UPDATE(`status`) ON ".$value['db'].".`software_update_inst` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - $query = "GRANT SELECT, UPDATE(`updated`) ON ".$conf['mysql']['master_database'].".`server` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT, UPDATE(`updated`) ON ".$value['db'].".`server` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - $query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`) ON ".$conf['mysql']['master_database'].".`web_domain` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`) ON ".$value['db'].".`web_domain` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - $query = "GRANT SELECT ON ".$conf['mysql']['master_database'].".`sys_group` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT ON ".$value['db'].".`sys_group` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - $query = "GRANT SELECT, UPDATE (`action_state`, `response`) ON ".$conf['mysql']['master_database'].".`sys_remoteaction` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT, UPDATE (`action_state`, `response`) ON ".$value['db'].".`sys_remoteaction` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - $query = "GRANT SELECT, INSERT , DELETE ON ".$conf['mysql']['master_database'].".`monitor_data` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT, INSERT , DELETE ON ".$value['db'].".`monitor_data` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - $query = "GRANT SELECT, INSERT, UPDATE ON ".$conf['mysql']['master_database'].".`mail_traffic` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT, INSERT, UPDATE ON ".$value['db'].".`mail_traffic` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - $query = "GRANT SELECT, INSERT, UPDATE ON ".$conf['mysql']['master_database'].".`web_traffic` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + $query = "GRANT SELECT, INSERT, UPDATE ON ".$value['db'].".`web_traffic` TO '".$value['user']."'@'".$host."' "; if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + $this->error('Unable to set rights of user in master database: '.$value['db'].' Error: '.$this->dbmaster->errorMessage); } - } + /* + * It is all done. Relod the rights... + */ + $this->dbmaster->query('FLUSH PRIVILEGES;'); + } //** writes postfix configuration files diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php new file mode 100644 index 000000000..04551dce1 --- /dev/null +++ b/install/lib/update.lib.php @@ -0,0 +1,154 @@ + /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 --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 --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"); +} + +function updateDbAndIni() { + global $inst, $conf; + + //* 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'].'.'); + } + + //** Create the mysql database + $inst->configure_database(); + + //** empty all databases + $db_tables = $inst->db->getTables(); + + foreach($db_tables as $table) { + + $inst->db->query("TRUNCATE $table"); + } + + //** load old data back into database + if( !empty($conf["mysql"]["admin_password"]) ) { + + 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 --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql"); + } + + + //** Update server ini + $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']); + $old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config'])); + unset($tmp_server_rec); + $tpl_ini_array = ini_to_array(rf('tpl/server.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); + $inst->db->query("UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']); + unset($old_ini_array); + unset($tpl_ini_array); + 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); +} + +?> diff --git a/install/update.php b/install/update.php index 59566b4e7..84faa0540 100644 --- a/install/update.php +++ b/install/update.php @@ -50,6 +50,9 @@ echo "\n\n>> Update \n\n"; //** Include the library with the basic installer functions require_once('lib/install.lib.php'); +//** Include the library with the basic updater functions +require_once('lib/update.lib.php'); + //** Include the base class of the installer class require_once('lib/installer_base.lib.php'); @@ -143,33 +146,10 @@ if( empty($conf["mysql"]["admin_password"]) ) { $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 --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 --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"); - +/* + * Prepare the dump of the database + */ +prepareDBDump(); //* initialize the database $inst->db = new db(); @@ -208,104 +188,25 @@ if($conf['mysql']['master_slave_setup'] == 'y') { $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'].'.'); -} - -//** Create the mysql database -$inst->configure_database(); +/* + * dump the new Database and reconfigure the server.ini + */ +updateDbAndIni(); -if($conf['mysql']['master_slave_setup'] == 'y') { +/* + * Reconfigure the permisson if needed + * (if this is done at client side, only this client is updated. + * If this is done at server side, all clients are updated. + */ +//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(); - -foreach($db_tables as $table) { - - $inst->db->query("TRUNCATE $table"); -} - -//** load old data back into database -if( !empty($conf["mysql"]["admin_password"]) ) { - - 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 --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql"); -} - - -//** Update server ini -$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']); -$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config'])); -unset($tmp_server_rec); -$tpl_ini_array = ini_to_array(rf('tpl/server.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); -$inst->db->query("UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']); -unset($old_ini_array); -unset($tpl_ini_array); -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'); diff --git a/interface/web/admin/lib/lang/de_remote_action.lng b/interface/web/admin/lib/lang/de_remote_action.lng index dcaa104a2..00cbfa893 100644 --- a/interface/web/admin/lib/lang/de_remote_action.lng +++ b/interface/web/admin/lib/lang/de_remote_action.lng @@ -3,6 +3,8 @@ $wb['select_server_txt'] = 'Server auswählen'; $wb['btn_do_txt'] = 'Aktion ausführen'; $wb['do_osupdate_caption'] = 'Betriebssystem-Update auf entferntem Server ausführen'; $wb['do_osupdate_desc'] = "Diese Aktion wird ein 'aptitude -y upgrade' auf Ihrem ausgewählten Server ausführen.

DIES GESCHIEHT AUF IHRE EIGENE VERANTWORTUNG!"; +$wb['do_ispcupdate_caption'] = 'ISPConfig 3 - Update auf entferntem Server ausführen'; +$wb['do_ispcupdate_desc'] = "Diese Aktion wird ein Update des ISPConfig3-Systems auf Ihrem ausgewählten Server ausführen.

DIES GESCHIEHT AUF IHRE EIGENE VERANTWORTUNG!"; $wb['action_scheduled'] = "Die Aktion wurde zur Ausführung vorgemerkt"; $wb['select_all_server'] = "Alle Server"; ?> diff --git a/interface/web/admin/lib/lang/en_remote_action.lng b/interface/web/admin/lib/lang/en_remote_action.lng index 1742d6127..512459505 100644 --- a/interface/web/admin/lib/lang/en_remote_action.lng +++ b/interface/web/admin/lib/lang/en_remote_action.lng @@ -2,7 +2,9 @@ $wb['select_server_txt'] = 'Select Server'; $wb['btn_do_txt'] = 'Execute action'; $wb['do_osupdate_caption'] = 'Do OS-Update at remote server'; -$wb['do_osupdate_desc'] = "This Action does a 'aptitude -y upgrade' at your selected Server.

USE THIS AT YOUR OWN RISK!"; +$wb['do_osupdate_desc'] = "This Action does a 'aptitude -y upgrade' at your selected server.

USE THIS AT YOUR OWN RISK!"; +$wb['do_ispcupdate_caption'] = 'Do ISPConfig 3 - Update at remote server'; +$wb['do_ispcupdate_desc'] = "This action does a ISPConfig3 update at your selected server.

USE THIS AT YOUR OWN RISK!"; $wb['action_scheduled'] = "The action is scheduled for execution"; $wb['select_all_server'] = "All server"; ?> diff --git a/interface/web/admin/remote_action_ispcupdate.php b/interface/web/admin/remote_action_ispcupdate.php new file mode 100644 index 000000000..3abcd7131 --- /dev/null +++ b/interface/web/admin/remote_action_ispcupdate.php @@ -0,0 +1,99 @@ +auth->check_module_permissions('admin'); + +//* This is only allowed for administrators +if(!$app->auth->is_admin()) die('only allowed for administrators.'); + +$app->uses('tpl'); + +$app->tpl->newTemplate('form.tpl.htm'); +$app->tpl->setInclude('content_tpl', 'templates/remote_action_ispcupdate.htm'); + +//* load language file +$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_remote_action.lng'; +include($lng_file); + +/* + * We need a list of all Servers + */ +$sysServers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name"); +$dropDown = ""; +foreach ($sysServers as $server) { + $dropDown .= ""; +} +$app->tpl->setVar('server_option', $dropDown); + +$msg = ''; + +/* + * If the user wants to do the action, write this to our db +*/ +if (isset($_POST['server_select'])) { + $server = $_POST['server_select']; + $servers = array(); + if ($server == '*') { + /* We need ALL Servers */ + foreach ($sysServers as $server) { + $servers[] = $server['server_id']; + } + } + else { + /* We need only the selected Server */ + $servers[] = $_POST['server_select']; + } + foreach ($servers as $serverId) { + $sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_status, response) " . + "VALUES (". + (int)$serverId . ", " . + time() . ", " . + "'ispc_update', " . + "'', " . + "'pending', " . + "''" . + ")"; + $app->db->query($sql); + } + $msg = $wb['action_scheduled']; +} + +$app->tpl->setVar('msg',$msg); + +$app->tpl->setVar($wb); + +$app->tpl_defaults(); +$app->tpl->pparse(); + + +?> \ No newline at end of file diff --git a/interface/web/admin/templates/remote_action_ispcupdate.htm b/interface/web/admin/templates/remote_action_ispcupdate.htm new file mode 100644 index 000000000..4e32cac09 --- /dev/null +++ b/interface/web/admin/templates/remote_action_ispcupdate.htm @@ -0,0 +1,25 @@ +

+

+ +
+ +
+
{tmpl_var name='do_osupdate_caption'} +
+ + +
+
+ + +

+ + +
+ +
+
+ +
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php index 7e8c0b1e0..81aa27734 100644 --- a/server/mods-available/remoteaction_core_module.inc.php +++ b/server/mods-available/remoteaction_core_module.inc.php @@ -118,6 +118,13 @@ class remoteaction_core_module { * we stop executing the actions not to waste more time */ return; } + if ($action['action_type'] == 'ispc_update') { + /* do the update */ + $this->_doIspCUpdate($action); + /* this action takes so much time, + * we stop executing the actions not to waste more time */ + return; + } } } @@ -134,5 +141,25 @@ class remoteaction_core_module { $this->_actionDone($action['action_id'], 'ok'); } + private function _doIspCUpdate($action) { + $new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt'); + $new_version = trim($new_version); + /* + * Do the update + */ + exec("cd /tmp"); + exec("wget http://www.ispconfig.org/downloads/ISPConfig-" . $new_version . ".tar.gz"); + exec("tar xvfz ISPConfig-" . $new_version . ".tar.gz"); + exec("cd ispconfig3_install/install"); + + exec("touch autoupdate"); + exec("php -q autoupdate.php"); + + /* + * All well done! + */ + $this->_actionDone($action['action_id'], 'ok'); + } + } ?> \ No newline at end of file -- GitLab