From 2e1d4af13f48e0db06c93eff7d9d6f2ff7e17939 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 16 Dec 2008 11:49:46 -0500
Subject: [PATCH] Added a newline at the end of the master_cf_amavis.master file to prevent debian update problems.
---
install/tpl/config.inc.php.master | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 0dc1c8a..4f36055 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -44,7 +44,7 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.0.8.'.$revision);
+define('ISPC_APP_VERSION', '3.0.0.8');
//** Database
@@ -61,6 +61,14 @@
define("DB_USER",$conf["db_user"]);
define("DB_PASSWORD",$conf["db_password"]);
define("DB_CHARSET",$conf["db_charset"]);
+
+
+//** Database settings for the master DB. This setting is only used in multiserver setups
+$conf["dbmaster_type"] = 'mysql';
+$conf["dbmaster_host"] = '{mysql_master_server_host}';
+$conf["dbmaster_database"] = '{mysql_master_server_database}';
+$conf["dbmaster_user"] = '{mysql_master_server_ispconfig_user}';
+$conf["dbmaster_password"] = '{mysql_master_server_ispconfig_password}';
//** Paths
@@ -129,4 +137,4 @@
define("LOGLEVEL_WARN",1);
define("LOGLEVEL_ERROR",2);
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1