Skip to content

Commit 12e3ba4

Browse files
tbrehmtbrehm
committed
Added support for internal repliaction for ispconfig multiserver setups.
1 parent a123dfe commit 12e3ba4

File tree

11 files changed

+263
-38
lines changed

11 files changed

+263
-38
lines changed

‎install/dist/conf/centos52.conf.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@
5555
$conf['mysql']['charset'] = 'utf8';
5656
$conf['mysql']['ispconfig_user'] = 'ispconfig';
5757
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
58+
$conf['mysql']['master_slave_setup'] = 'n';
59+
$conf['mysql']['master_host'] = '';
60+
$conf['mysql']['master_database'] = 'dbispconfig';
61+
$conf['mysql']['master_admin_user'] = 'root';
62+
$conf['mysql']['master_admin_password'] = '';
63+
$conf['mysql']['master_ispconfig_user'] = '';
64+
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
5865

5966
//* Apache
6067
$conf['apache']['user'] = 'apache';

‎install/dist/conf/debian40.conf.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@
5555
$conf['mysql']['charset'] = 'utf8';
5656
$conf['mysql']['ispconfig_user'] = 'ispconfig';
5757
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
58+
$conf['mysql']['master_slave_setup'] = 'n';
59+
$conf['mysql']['master_host'] = '';
60+
$conf['mysql']['master_database'] = 'dbispconfig';
61+
$conf['mysql']['master_admin_user'] = 'root';
62+
$conf['mysql']['master_admin_password'] = '';
63+
$conf['mysql']['master_ispconfig_user'] = '';
64+
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
5865

5966
//* Apache
6067
$conf['apache']['user'] = 'www-data';

‎install/dist/conf/fedora9.conf.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@
5555
$conf['mysql']['charset'] = 'utf8';
5656
$conf['mysql']['ispconfig_user'] = 'ispconfig';
5757
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
58+
$conf['mysql']['master_slave_setup'] = 'n';
59+
$conf['mysql']['master_host'] = '';
60+
$conf['mysql']['master_database'] = 'dbispconfig';
61+
$conf['mysql']['master_admin_user'] = 'root';
62+
$conf['mysql']['master_admin_password'] = '';
63+
$conf['mysql']['master_ispconfig_user'] = '';
64+
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
5865

5966
//* Apache
6067
$conf['apache']['user'] = 'apache';

‎install/dist/conf/opensuse110.conf.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@
5555
$conf['mysql']['charset'] = 'utf8';
5656
$conf['mysql']['ispconfig_user'] = 'ispconfig';
5757
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
58+
$conf['mysql']['master_slave_setup'] = 'n';
59+
$conf['mysql']['master_host'] = '';
60+
$conf['mysql']['master_database'] = 'dbispconfig';
61+
$conf['mysql']['master_admin_user'] = 'root';
62+
$conf['mysql']['master_admin_password'] = '';
63+
$conf['mysql']['master_ispconfig_user'] = '';
64+
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
5865

5966
//* Apache
6067
$conf['apache']['user'] = 'wwwrun';

‎install/dist/lib/fedora.lib.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,12 @@ public function install_ispconfig()
511511
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
512512
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
513513
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
514+
515+
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
516+
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
517+
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
518+
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
519+
514520
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
515521
wf("$install_dir/interface/lib/$configfile", $content);
516522

@@ -524,6 +530,12 @@ public function install_ispconfig()
524530
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
525531
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
526532
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
533+
534+
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
535+
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
536+
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
537+
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
538+
527539
$content = str_replace('{server_id}', $conf['server_id'], $content);
528540
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
529541
wf("$install_dir/server/lib/$configfile", $content);

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,12 @@ public function install_ispconfig()
529529
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
530530
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
531531
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
532+
533+
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
534+
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
535+
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
536+
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
537+
532538
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
533539
wf("$install_dir/interface/lib/$configfile", $content);
534540

@@ -542,6 +548,12 @@ public function install_ispconfig()
542548
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
543549
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
544550
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
551+
552+
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
553+
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
554+
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
555+
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
556+
545557
$content = str_replace('{server_id}', $conf['server_id'], $content);
546558
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
547559
wf("$install_dir/server/lib/$configfile", $content);

‎install/install.php‎

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
$conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en');
9494

9595
//** Select installation mode
96-
$install_mode = $inst->simple_query('Installation mode', array('Standard','Expert'), 'Standard');
96+
$install_mode = $inst->simple_query('Installation mode', array('standard','expert'), 'standard');
9797

9898

9999
//** Get the hostname
@@ -134,7 +134,7 @@
134134
$inst->db = new db();
135135

136136
//** Begin with standard or expert installation
137-
if($install_mode == 'Standard') {
137+
if($install_mode == 'standard') {
138138

139139
//* Create the mysql database
140140
$inst->configure_database();
@@ -227,11 +227,45 @@
227227
// $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
228228
// Server ID is an autoInc value of the mysql database now
229229

230-
if(strtolower($inst->simple_query('Create a new database? (We do not want to join a existing ISPConfig server setup)',array('y','n'),'y')) == 'y') {
231-
//* Create the mysql database
232-
$inst->configure_database();
233-
//system('/etc/init.d/mysql restart');
230+
if(strtolower($inst->simple_query('Shall this server join an existing ISPConfig multiserver setup',array('y','n'),'n')) == 'y') {
231+
$conf['mysql']['master_slave_setup'] = 'y';
232+
233+
//** Get MySQL root credentials
234+
$finished = false;
235+
do {
236+
$tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']);
237+
$tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']);
238+
$tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']);
239+
$tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']);
240+
241+
//* Initialize the MySQL server connection
242+
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
243+
$conf['mysql']['master_host'] = $tmp_mysql_server_host;
244+
$conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
245+
$conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;
246+
$conf['mysql']['master_database'] = $tmp_mysql_server_database;
247+
$finished = true;
248+
} else {
249+
swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
250+
}
251+
} while ($finished == false);
252+
unset($finished);
253+
254+
// initialize the connection to the master database
255+
$inst->dbmaster = new db();
256+
if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
257+
$inst->dbmaster->dbHost = $conf['mysql']["master_host"];
258+
$inst->dbmaster->dbName = $conf['mysql']["master_database"];
259+
$inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];
260+
$inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];
261+
262+
} else {
263+
// the master DB is the same then the slave DB
264+
$inst->dbmaster = $inst->db;
234265
}
266+
267+
//* Create the mysql database
268+
$inst->configure_database();
235269

236270
//* Insert the Server record into the database
237271
swriteln('Adding ISPConfig server record to database.');
@@ -297,7 +331,7 @@
297331
}
298332

299333
//** Configure Apache
300-
swriteln("If this server shall run the ispconfig interface, select 'y' in the next option.");
334+
swriteln("\nHint: If this server shall run the ispconfig interface, select 'y' in the next option.\n");
301335
if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {
302336
swriteln('Configuring Apache');
303337
$inst->configure_apache();

‎install/lib/installer_base.lib.php‎

Lines changed: 68 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -117,25 +117,24 @@ public function configure_database()
117117
{
118118
global $conf;
119119

120-
$cf = $conf['mysql']; // make $conf['mysql'] more accessible
121120
//** Create the database
122-
if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$cf['database'].' DEFAULT CHARACTER SET '.$cf['charset'])) {
123-
$this->error('Unable to create MySQL database: '.$cf['database'].'.');
121+
if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$conf['mysql']['database'].' DEFAULT CHARACTER SET '.$conf['mysql']['charset'])) {
122+
$this->error('Unable to create MySQL database: '.$conf['mysql']['database'].'.');
124123
}
125124

126125
//* Set the database name in the DB library
127-
$this->db->dbName = $cf['database'];
126+
$this->db->dbName = $conf['mysql']['database'];
128127

129128
//* Load the database dump into the database, if database contains no tables
130129
$db_tables = $this->db->getTables();
131130
if(count($db_tables) > 0) {
132131
$this->error('Stopped: Database already contains some tables.');
133132
} else {
134-
if($cf['admin_password'] == '') {
135-
caselog("mysql --default-character-set=".$cf['charset']." -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
133+
if($conf['mysql']['admin_password'] == '') {
134+
caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
136135
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
137136
} else {
138-
caselog("mysql --default-character-set=".$cf['charset']." -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
137+
caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
139138
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
140139
}
141140
$db_tables = $this->db->getTables();
@@ -150,40 +149,74 @@ public function add_database_server_record() {
150149

151150
global $conf;
152151

153-
$cf = $conf['mysql']; // make $conf['mysql'] more accessible
154-
155-
if($cf['host'] == 'localhost') {
152+
if($conf['mysql']['host'] == 'localhost') {
156153
$from_host = 'localhost';
157154
} else {
158155
$from_host = $conf['hostname'];
159156
}
160157

161-
// Delete ISPConfig user, in case that it exists
162-
$this->db->query("DELETE FROM mysql.user WHERE User = '".$cf['ispconfig_user']."' AND Host = '".$from_host."';");
163-
$this->db->query("DELETE FROM mysql.db WHERE Db = '".$cf['database']."' AND Host = '".$from_host."';");
158+
// Delete ISPConfig user in the local database, in case that it exists
159+
$this->db->query("DELETE FROM mysql.user WHERE User = '".$conf['mysql']['ispconfig_user']."' AND Host = '".$from_host."';");
160+
$this->db->query("DELETE FROM mysql.db WHERE Db = '".$conf['mysql']['database']."' AND Host = '".$from_host."';");
164161
$this->db->query('FLUSH PRIVILEGES;');
165162

166-
//* Create the ISPConfig database user
167-
$query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$cf['database'].".* "
168-
."TO '".$cf['ispconfig_user']."'@'".$from_host."' "
169-
."IDENTIFIED BY '".$cf['ispconfig_password']."';";
163+
//* Create the ISPConfig database user in the local database
164+
$query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$conf['mysql']['database'].".* "
165+
."TO '".$conf['mysql']['ispconfig_user']."'@'".$from_host."' "
166+
."IDENTIFIED BY '".$conf['mysql']['ispconfig_password']."';";
170167
if(!$this->db->query($query)) {
171-
$this->error('Unable to create database user: '.$cf['ispconfig_user'].' Error: '.$this->db->errorMessage);
168+
$this->error('Unable to create database user: '.$conf['mysql']['ispconfig_user'].' Error: '.$this->db->errorMessage);
172169
}
173170

174171
//* Reload database privelages
175172
$this->db->query('FLUSH PRIVILEGES;');
176173

177174
//* Set the database name in the DB library
178-
$this->db->dbName = $cf['database'];
175+
$this->db->dbName = $conf['mysql']['database'];
179176

180177
$server_ini_content = rf("tpl/server.ini.master");
181178
$server_ini_content = mysql_real_escape_string($server_ini_content);
182179

183-
$sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', 1, 1, 1, 1, 1, 1, '$server_ini_content', 0, 1);";
184-
$this->db->query($sql);
185-
$conf['server_id'] = $this->db->insertID();
186-
$conf['server_id'] = $conf['server_id'];
180+
if($conf['mysql']['master_slave_setup'] == 'y') {
181+
182+
//* Insert the server record in master DB
183+
$sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', 1, 1, 1, 1, 1, 1, '$server_ini_content', 0, 1);";
184+
$this->dbmaster->query($sql);
185+
$conf['server_id'] = $this->dbmaster->insertID();
186+
$conf['server_id'] = $conf['server_id'];
187+
188+
//* Insert the same record in the local DB
189+
$sql = "INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES ('".$conf['server_id']."',1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', 1, 1, 1, 1, 1, 1, '$server_ini_content', 0, 1);";
190+
$this->db->query($sql);
191+
192+
//* insert the ispconfig user in the remote server
193+
$from_host = $conf['hostname'];
194+
195+
//* username for the ispconfig user
196+
$conf['mysql']['master_ispconfig_user'] = 'ispconfigserver'.$conf['server_id'];
197+
198+
//* Delete ISPConfig user in the local database, in case that it exists
199+
$this->dbmaster->query("DELETE FROM mysql.user WHERE User = '".$conf['mysql']['master_ispconfig_user']."' AND Host = '".$from_host."';");
200+
$this->dbmaster->query("DELETE FROM mysql.db WHERE Db = '".$conf['mysql']['master_database']."' AND Host = '".$from_host."';");
201+
$this->dbmaster->query('FLUSH PRIVILEGES;');
202+
203+
//* Create the ISPConfig database user in the local database
204+
$query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$conf['mysql']['master_database'].".* "
205+
."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$from_host."' "
206+
."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';";
207+
if(!$this->dbmaster->query($query)) {
208+
$this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage);
209+
}
210+
211+
} else {
212+
//* Insert the server, if its not a mster / slave setup
213+
$sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', 1, 1, 1, 1, 1, 1, '$server_ini_content', 0, 1);";
214+
$this->db->query($sql);
215+
$conf['server_id'] = $this->db->insertID();
216+
$conf['server_id'] = $conf['server_id'];
217+
}
218+
219+
187220
}
188221

189222

@@ -724,6 +757,12 @@ public function install_ispconfig()
724757
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
725758
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
726759
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
760+
761+
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
762+
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
763+
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
764+
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
765+
727766
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
728767
wf("$install_dir/interface/lib/$configfile", $content);
729768

@@ -737,6 +776,12 @@ public function install_ispconfig()
737776
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
738777
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
739778
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
779+
780+
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
781+
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
782+
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
783+
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
784+
740785
$content = str_replace('{server_id}', $conf['server_id'], $content);
741786
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
742787
wf("$install_dir/server/lib/$configfile", $content);

‎server/lib/app.inc.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,24 @@ function app() {
4040
if($conf["start_db"] == true) {
4141
$this->load('db_'.$conf["db_type"]);
4242
$this->db = new db;
43+
44+
/*
45+
Initialize the connection to the master DB,
46+
if we are in a multiserver setup
47+
*/
48+
49+
if($conf["dbmaster_host"] != '' && $conf["dbmaster_host"] != $conf["db_host"]) {
50+
$this->dbmaster = new db;
51+
if($this->dbmaster->linkId) $this->dbmaster->closeConn();
52+
$this->dbmaster->dbHost = $conf["dbmaster_host"];
53+
$this->dbmaster->dbName = $conf["dbmaster_database"];
54+
$this->dbmaster->dbUser = $conf["dbmaster_user"];
55+
$this->dbmaster->dbPass = $conf["dbmaster_password"];
56+
} else {
57+
$this->dbmaster = $this->db;
58+
}
59+
60+
4361
}
4462

4563
}

0 commit comments

Comments
 (0)