From 0fed3bec53dae6697fbbae20e2349ad9a2298bb5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 15 Aug 2012 12:19:53 +0000
Subject: [PATCH] Fixed: FS#2323 - Replace fixed localhost setting in
install/tpl/mysql_clientdb.conf.master
---
install/dist/lib/fedora.lib.php | 1 +
install/dist/lib/opensuse.lib.php | 1 +
install/lib/installer_base.lib.php | 1 +
install/tpl/mysql_clientdb.conf.master | 2 +-
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 2cf6764add..1275223677 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -1072,6 +1072,7 @@ class installer_dist extends installer_base {
}
$content = rf("tpl/mysql_clientdb.conf.master");
+ $content = str_replace('{hostname}',$conf['mysql']['host'],$content);
$content = str_replace('{username}',$conf['mysql']['admin_user'],$content);
$content = str_replace('{password}',$conf['mysql']['admin_password'], $content);
wf("$install_dir/server/lib/mysql_clientdb.conf",$content);
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 248cf61fa1..8aac05f795 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1115,6 +1115,7 @@ class installer_dist extends installer_base {
}
$content = rf("tpl/mysql_clientdb.conf.master");
+ $content = str_replace('{hostname}',$conf['mysql']['host'],$content);
$content = str_replace('{username}',$conf['mysql']['admin_user'],$content);
$content = str_replace('{password}',$conf['mysql']['admin_password'], $content);
wf("$install_dir/server/lib/mysql_clientdb.conf",$content);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 2747a89a95..1933db8f96 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -2008,6 +2008,7 @@ class installer_base {
}
$content = rf('tpl/mysql_clientdb.conf.master');
+ $content = str_replace('{hostname}',$conf['mysql']['host'],$content);
$content = str_replace('{username}',$conf['mysql']['admin_user'],$content);
$content = str_replace('{password}',$conf['mysql']['admin_password'], $content);
wf($install_dir.'/server/lib/mysql_clientdb.conf',$content);
diff --git a/install/tpl/mysql_clientdb.conf.master b/install/tpl/mysql_clientdb.conf.master
index 0d3de00f00..e6eba12615 100644
--- a/install/tpl/mysql_clientdb.conf.master
+++ b/install/tpl/mysql_clientdb.conf.master
@@ -1,6 +1,6 @@
<?php
-$clientdb_host = 'localhost';
+$clientdb_host = '{hostname}';
$clientdb_user = '{username}';
$clientdb_password = '{password}';
--
GitLab