From 56dfe60128f99d4199154f7df443723b07c13480 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sat, 25 Oct 2008 16:32:43 -0400
Subject: [PATCH]
---
install/update.php | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 17 deletions(-)
diff --git a/install/update.php b/install/update.php
index 3095b04..3200a6d 100644
--- a/install/update.php
+++ b/install/update.php
@@ -59,21 +59,36 @@
}
//** Get distribution identifier
-$distname = get_distname();
+$dist = get_distname();
include_once("/usr/local/ispconfig/server/lib/config.inc.php");
$conf_old = $conf;
unset($conf);
+if($dist['id'] == '') die('Linux Dustribution or Version not recognized.');
+
//** Include the distribution specific installer class library and configuration
-include_once('dist/lib/'.$distname.'.lib.php');
-include_once('dist/conf/'.$distname.'.conf.php');
+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');
+
+//** 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"]["ispconfig_user"] = $conf_old["db_user"];
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
+
+// 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['ispconfig_log_priority'] = $conf_old["log_priority"];
$inst = new installer();
@@ -128,6 +143,26 @@
system("mysql -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
+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);
+
+
//** Shall the services be reconfigured during update
$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes','no'),'yes');
@@ -174,6 +209,16 @@
//** Configure Apache
swriteln('Configuring Apache');
$inst->configure_apache();
+
+ //* Configure DBServer
+ swriteln('Configuring DBServer');
+ $inst->configure_dbserver();
+
+ //if(@is_dir('/etc/Bastille')) {
+ //* Configure Firewall
+ swriteln('Configuring Firewall');
+ $inst->configure_firewall();
+ //}
}
//** Configure ISPConfig
@@ -181,7 +226,7 @@
//** Customise the port ISPConfig runs on
-$inst->conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
+$conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
$inst->install_ispconfig();
@@ -195,19 +240,19 @@
//** Restart services:
if($reconfigure_services_answer == 'yes') {
swriteln('Restarting services ...');
- system("/etc/init.d/mysql restart");
- system("/etc/init.d/postfix restart");
- system("/etc/init.d/saslauthd restart");
- system("/etc/init.d/amavis restart");
- system("/etc/init.d/clamav-daemon restart");
- system("/etc/init.d/courier-authdaemon restart");
- system("/etc/init.d/courier-imap restart");
- system("/etc/init.d/courier-imap-ssl restart");
- system("/etc/init.d/courier-pop restart");
- system("/etc/init.d/courier-pop-ssl restart");
- system("/etc/init.d/apache2 restart");
- system("/etc/init.d/pure-ftpd-mysql restart");
- system("/etc/init.d/mydns restart");
+ 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');
}
echo "Update finished.\n";
--
Gitblit v1.9.1