From db5aa62b7faa2685f29215d4d08e13d28fd481a1 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 15 Dec 2008 04:22:20 -0500
Subject: [PATCH] - Added a global system settings storage in ini format. - Updated the user and database prefixes to use this storage.

---
 install/tpl/config.inc.php.master |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index c8796b8..4f36055 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,6 +1,7 @@
 <?php
+
 /*
-Copyright (c) 2008, Till Brehm, Falko Timme, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -37,10 +38,13 @@
 	ini_set('register_globals',0);
 }
 
+//** SVN Revision
+$svn_revision = '$Revision$';
+$revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.0.8 beta');
+define('ISPC_APP_VERSION', '3.0.0.8');
 
 
 //** Database
@@ -57,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
@@ -125,4 +137,4 @@
 define("LOGLEVEL_WARN",1);
 define("LOGLEVEL_ERROR",2);
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1