From 3cc04cc5219bfd72d83b58d2f6ae83092e0c9fb6 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 05 Jul 2016 07:14:13 -0400
Subject: [PATCH] Merge branch 'stable-3.1' into 'stable-3.1'
---
install/tpl/config.inc.php.master | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 0737c13..02a7b2f 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -83,7 +83,7 @@
//** 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_host'] = '{mysql_master_server_port}';
+$conf['dbmaster_port'] = '{mysql_master_server_port}';
$conf['dbmaster_database'] = '{mysql_master_server_database}';
$conf['dbmaster_user'] = '{mysql_master_server_ispconfig_user}';
$conf['dbmaster_password'] = '{mysql_master_server_ispconfig_password}';
--
Gitblit v1.9.1