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 | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/install/update.php b/install/update.php
index d5e349c..3200a6d 100644
--- a/install/update.php
+++ b/install/update.php
@@ -59,15 +59,24 @@
}
//** 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"];
@@ -75,7 +84,11 @@
$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();
@@ -144,7 +157,7 @@
}
$new_ini = array_to_ini($tpl_ini_array);
-$inst->db->query("UPDATE server SET config = '".addslashes($new_ini)."' WHERE server_id = ".$conf['server_id']);
+$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);
@@ -200,6 +213,12 @@
//* Configure DBServer
swriteln('Configuring DBServer');
$inst->configure_dbserver();
+
+ //if(@is_dir('/etc/Bastille')) {
+ //* Configure Firewall
+ swriteln('Configuring Firewall');
+ $inst->configure_firewall();
+ //}
}
//** Configure ISPConfig
@@ -207,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();
@@ -221,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