From 2332f196052b467beb2038aaa917faa2eeb05919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20Ka=CC=88ser?= Date: Sat, 16 May 2015 23:56:30 +0200 Subject: [PATCH] two small fixes + indentation --- install/tpl/authmysqlrc.master | 3 +-- install/tpl/config.inc.php.master | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/install/tpl/authmysqlrc.master b/install/tpl/authmysqlrc.master index 3630600b0..ec4095d3f 100644 --- a/install/tpl/authmysqlrc.master +++ b/install/tpl/authmysqlrc.master @@ -1,8 +1,7 @@ MYSQL_SERVER {mysql_server_host} -MYSQL_PORT {mysql_server_port} MYSQL_USERNAME {mysql_server_ispconfig_user} MYSQL_PASSWORD {mysql_server_ispconfig_password} -MYSQL_PORT 0 +MYSQL_PORT {mysql_server_port} MYSQL_DATABASE {mysql_server_database} MYSQL_USER_TABLE mail_user MYSQL_CRYPT_PWFIELD password diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index 0737c13a3..02a7b2f65 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -83,7 +83,7 @@ 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_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}'; -- GitLab