From dcff5718f345f55f7ea81f18d1f086facde4eacf Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Mon, 20 Aug 2007 23:14:51 -0400
Subject: [PATCH] * Using new ISPC_*_PATH constants * Adding new data schema (to be moved shortly * no more $conf['classpath']
---
install/update.php | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/install/update.php b/install/update.php
index 394ab9b..5cec040 100644
--- a/install/update.php
+++ b/install/update.php
@@ -38,11 +38,13 @@
// Include the base class of the installer class
require_once('lib/installer_base.lib.php');
+include_once("options.conf.php");
+$conf['dist'] = $dist;
$distname = get_distname();
include_once("/usr/local/ispconfig/server/lib/config.inc.php");
$conf_old = $conf;
-unset $conf;
+unset($conf);
// Include the distribution specific installer class library
// and configuration
@@ -50,10 +52,10 @@
include_once('dist/conf/'.$distname.'.conf.php');
// Set the mysql login information
-$conf["mysql_server_host"] = $conf_old["db_host"];
-$conf["mysql_server_database"] = $conf_old["db_database"];
-$conf["mysql_server_ispconfig_user"] = $conf_old["db_user"];
-$conf["mysql_server_ispconfig_password"] = $conf_old["db_password"];
+$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"];
$inst = new installer();
@@ -71,12 +73,19 @@
// Database update is a bit brute force and should be rebuild later ;)
// export the current database data
-exec("mysqldump -h $conf[mysql_server_host] -u $conf[mysql_server_ispconfig_user] -p$conf[mysql_server_ispconfig_password] -c -t --add-drop-table --add-locks --all --quick --lock-tables $conf[mysql_server_database] > existing_db.sql &> /dev/null");
+if($conf["mysql"]["admin_password"] != '') {
+ system("mysqldump -h $conf[mysql_server_host] -u $conf[mysql_server_admin_user] -p$conf[mysql_server_admin_password] -c -t --add-drop-table --all --quick $conf[mysql_server_database] > existing_db.sql");
+} else {
+ system("mysqldump -h $conf[mysql_server_host] -u $conf[mysql_server_admin_user] -c -t --add-drop-table --all --quick $conf[mysql_server_database] > existing_db.sql");
+}
+
// Delete the old database
exec("/etc/init.d/mysql stop");
-exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
+sleep(3);
+if($conf["mysql"]["database"] != '') exec("rm -rf /var/lib/mysql/".$conf["mysql"]["database"]);
exec("/etc/init.d/mysql start");
+sleep(5);
// Create the mysql database
$inst->configure_database();
@@ -88,8 +97,11 @@
}
// load old data back into database
-exec("mysql -h $conf[mysql_server_host] -u $conf[mysql_server_ispconfig_user] -p$conf[mysql_server_ispconfig_password] $conf[mysql_server_database] < existing_db.sql &> /dev/null");
-
+if($conf["mysql"]["admin_password"] != '') {
+ system("mysql -h $conf[mysql_server_host] -u $conf[mysql_server_admin_user] -p$conf[mysql_server_admin_password] $conf[mysql_server_database] < existing_db.sql");
+} else {
+ system("mysql -h $conf[mysql_server_host] -u $conf[mysql_server_admin_user] $conf[mysql_server_database] < existing_db.sql");
+}
// Configure postfix
$inst->configure_postfix('dont-create-certs');
@@ -118,9 +130,17 @@
swriteln('Configuring Getmail');
$inst->configure_getmail();
-// 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 ISPConfig
swriteln('Installing ISPConfig');
@@ -148,8 +168,9 @@
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");
echo "Update finished.\n";
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1