From 8ba08e0e37faa9017e1717ca3854bb25c999a277 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 06 Oct 2009 10:03:11 -0400
Subject: [PATCH] Merged revisions 1357 - 1402 from trunk.
---
install/update.php | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/install/update.php b/install/update.php
index 83bca4d..7285e58 100644
--- a/install/update.php
+++ b/install/update.php
@@ -100,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']);
--
Gitblit v1.9.1