Skip to content

Commit 82e9b9e

Browse files
author
Michel Käser
committed
define MySQL port by its own (rather than in the host with :port); it's simply cleaner
1 parent a523371 commit 82e9b9e

19 files changed

+59
-15
lines changed

‎install/dist/lib/debian60.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public function configure_dovecot()
127127
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
128128
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
129129
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
130+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
130131
$content = str_replace('{server_id}', $conf['server_id'], $content);
131132
wf($config_dir.'/'.$configfile, $content);
132133

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ public function configure_courier()
378378
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
379379
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
380380
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
381+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
381382
wf("$config_dir/$configfile", $content);
382383

383384
exec("chmod 660 $config_dir/$configfile");
@@ -496,6 +497,7 @@ public function configure_dovecot()
496497
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
497498
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
498499
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
500+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
499501
$content = str_replace('{server_id}', $conf['server_id'], $content);
500502
wf("$config_dir/$configfile", $content);
501503

@@ -653,6 +655,7 @@ public function configure_mydns()
653655
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
654656
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
655657
$content = str_replace('{mysql_server_host}', $conf["mysql"]["host"], $content);
658+
$content = str_replace('{mysql_server_port}', $conf["mysql"]["port"], $content);
656659
$content = str_replace('{server_id}', $conf["server_id"], $content);
657660
wf($conf["mydns"]["config_dir"].'/'.$configfile, $content);
658661
exec('chmod 600 '.$conf["mydns"]["config_dir"].'/'.$configfile);
@@ -932,11 +935,13 @@ public function install_ispconfig()
932935
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
933936
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
934937
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
938+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
935939

936940
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
937941
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
938942
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
939943
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
944+
$content = str_replace('{mysql_master_server_port}', $conf['mysql']['master_port'], $content);
940945

941946
$content = str_replace('{server_id}', $conf['server_id'], $content);
942947
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
@@ -957,11 +962,13 @@ public function install_ispconfig()
957962
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
958963
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
959964
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
965+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
960966

961967
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
962968
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
963969
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
964970
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
971+
$content = str_replace('{mysql_master_server_port}', $conf['mysql']['master_port'], $content);
965972

966973
$content = str_replace('{server_id}', $conf['server_id'], $content);
967974
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,7 @@ public function install_ispconfig()
834834
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
835835
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
836836
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
837+
$content = str_replace('{mysql_master_server_port}', $conf['mysql']['master_port'], $content);
837838

838839
$content = str_replace('{server_id}', $conf['server_id'], $content);
839840
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ public function configure_courier()
433433
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
434434
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
435435
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
436+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
436437
wf("$config_dir/$configfile", $content);
437438

438439
exec("chmod 660 $config_dir/$configfile");
@@ -545,6 +546,7 @@ public function configure_dovecot()
545546
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
546547
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
547548
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
549+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
548550
$content = str_replace('{server_id}', $conf['server_id'], $content);
549551
wf("$config_dir/$configfile", $content);
550552

@@ -700,6 +702,7 @@ public function configure_mydns()
700702
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
701703
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
702704
$content = str_replace('{mysql_server_host}', $conf["mysql"]["host"], $content);
705+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
703706
$content = str_replace('{server_id}', $conf["server_id"], $content);
704707
wf($conf["mydns"]["config_dir"].'/'.$configfile, $content);
705708
exec('chmod 600 '.$conf["mydns"]["config_dir"].'/'.$configfile);
@@ -1006,11 +1009,13 @@ public function install_ispconfig()
10061009
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
10071010
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
10081011
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
1012+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
10091013

10101014
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
10111015
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
10121016
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
10131017
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
1018+
$content = str_replace('{mysql_master_server_port}', $conf['mysql']['master_port'], $content);
10141019

10151020
$content = str_replace('{server_id}', $conf['server_id'], $content);
10161021
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
@@ -1031,11 +1036,13 @@ public function install_ispconfig()
10311036
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
10321037
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
10331038
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
1039+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
10341040

10351041
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
10361042
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
10371043
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
10381044
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
1045+
$content = str_replace('{mysql_master_server_port}', $conf['mysql']['master_port'], $content);
10391046

10401047
$content = str_replace('{server_id}', $conf['server_id'], $content);
10411048
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);

‎install/install.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@
189189
$finished = false;
190190
do {
191191
$tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host'],'mysql_hostname');
192+
$tmp_mysql_server_port = $inst->free_query('MySQL server port', $conf['mysql']['port'],'mysql_port');
192193
$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user'],'mysql_root_user');
193194
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');
194195
$tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database'],'mysql_database');
@@ -202,8 +203,9 @@
202203
}
203204

204205
//* Initialize the MySQL server connection
205-
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
206+
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, (int)$tmp_mysql_server_port)) {
206207
$conf['mysql']['host'] = $tmp_mysql_server_host;
208+
$conf['mysql']['port'] = $tmp_mysql_server_port;
207209
$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
208210
$conf['mysql']['admin_password'] = $tmp_mysql_server_admin_password;
209211
$conf['mysql']['database'] = $tmp_mysql_server_database;
@@ -535,13 +537,15 @@
535537
$finished = false;
536538
do {
537539
$tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host'],'mysql_master_hostname');
540+
$tmp_mysql_server_port = $inst->free_query('MySQL master server port', $conf['mysql']['master_port'],'mysql_master_port');
538541
$tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user'],'mysql_master_root_user');
539542
$tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password'],'mysql_master_root_password');
540543
$tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');
541544

542545
//* Initialize the MySQL server connection
543-
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
546+
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, (int)$tmp_mysql_server_port)) {
544547
$conf['mysql']['master_host'] = $tmp_mysql_server_host;
548+
$conf['mysql']['master_port'] = $tmp_mysql_server_port;
545549
$conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
546550
$conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;
547551
$conf['mysql']['master_database'] = $tmp_mysql_server_database;

‎install/lib/installer_base.lib.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,7 @@ public function configure_courier() {
968968
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
969969
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
970970
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
971+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
971972
wf($config_dir.'/'.$configfile, $content);
972973

973974
chmod($config_dir.'/'.$configfile, 0660);
@@ -1081,6 +1082,7 @@ public function configure_dovecot() {
10811082
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
10821083
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
10831084
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
1085+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
10841086
$content = str_replace('{server_id}', $conf['server_id'], $content);
10851087
wf($config_dir.'/'.$configfile, $content);
10861088

@@ -1259,6 +1261,7 @@ public function configure_mydns() {
12591261
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
12601262
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
12611263
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
1264+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
12621265
$content = str_replace('{server_id}', $conf['server_id'], $content);
12631266
wf($conf['mydns']['config_dir'].'/'.$configfile, $content);
12641267
chmod($conf['mydns']['config_dir'].'/'.$configfile, 0600);
@@ -1302,6 +1305,7 @@ public function configure_powerdns() {
13021305
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
13031306
$content = str_replace('{powerdns_database}', $conf['powerdns']['database'], $content);
13041307
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
1308+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
13051309
wf($conf['powerdns']['config_dir'].'/'.$configfile, $content);
13061310
chmod($conf['powerdns']['config_dir'].'/'.$configfile, 0600);
13071311
chown($conf['powerdns']['config_dir'].'/'.$configfile, 'root');
@@ -1967,11 +1971,13 @@ public function install_ispconfig() {
19671971
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
19681972
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
19691973
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
1974+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
19701975

19711976
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
19721977
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
19731978
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
19741979
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
1980+
$content = str_replace('{mysql_master_server_port}', $conf['mysql']['master_port'], $content);
19751981

19761982
$content = str_replace('{server_id}', $conf['server_id'], $content);
19771983
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
@@ -1992,11 +1998,13 @@ public function install_ispconfig() {
19921998
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
19931999
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
19942000
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
2001+
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
19952002

19962003
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
19972004
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
19982005
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
19992006
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
2007+
$content = str_replace('{mysql_master_server_port}', $conf['mysql']['master_port'], $content);
20002008

20012009
$content = str_replace('{server_id}', $conf['server_id'], $content);
20022010
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
@@ -2650,6 +2658,7 @@ protected function insert_db_credentials($tContents) {
26502658
$tContents = str_replace('{mysql_server_database}', $conf["mysql"]["database"], $tContents);
26512659
$tContents = str_replace('{mysql_server_ip}', $conf["mysql"]["ip"], $tContents);
26522660
$tContents = str_replace('{mysql_server_host}', $conf['mysql']['host'], $tContents);
2661+
$tContents = str_replace('{mysql_server_port}', $conf['mysql']['port'], $tContents);
26532662
$tContents = str_replace('{mysql_server_port}', $conf["mysql"]["port"], $tContents);
26542663

26552664
return $tContents;

‎install/tpl/authmysqlrc.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
MYSQL_SERVER {mysql_server_host}
2+
MYSQL_PORT {mysql_server_port}
23
MYSQL_USERNAME {mysql_server_ispconfig_user}
34
MYSQL_PASSWORD {mysql_server_ispconfig_password}
45
MYSQL_PORT 0

‎install/tpl/config.inc.php.master‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ define('DEVSYSTEM', 0);
6363
//** Database
6464
$conf['db_type'] = 'mysql';
6565
$conf['db_host'] = '{mysql_server_host}';
66+
$conf['db_port'] = '{mysql_server_port}';
6667
$conf['db_database'] = '{mysql_server_database}';
6768
$conf['db_user'] = '{mysql_server_ispconfig_user}';
6869
$conf['db_password'] = '{mysql_server_ispconfig_password}';
@@ -72,6 +73,7 @@ $conf['db_client_flags'] = 0;
7273

7374
define('DB_TYPE',$conf['db_type']);
7475
define('DB_HOST',$conf['db_host']);
76+
define('DB_PORT',$conf['db_port']);
7577
define('DB_DATABASE',$conf['db_database']);
7678
define('DB_USER',$conf['db_user']);
7779
define('DB_PASSWORD',$conf['db_password']);
@@ -81,6 +83,7 @@ define('DB_CHARSET',$conf['db_charset']);
8183
//** Database settings for the master DB. This setting is only used in multiserver setups
8284
$conf['dbmaster_type'] = 'mysql';
8385
$conf['dbmaster_host'] = '{mysql_master_server_host}';
86+
$conf['dbmaster_host'] = '{mysql_master_server_port}';
8487
$conf['dbmaster_database'] = '{mysql_master_server_database}';
8588
$conf['dbmaster_user'] = '{mysql_master_server_ispconfig_user}';
8689
$conf['dbmaster_password'] = '{mysql_master_server_ispconfig_password}';

‎install/tpl/debian6_dovecot-sql.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# );
1111

1212
driver = mysql
13-
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password}
13+
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password} port={mysql_server_port}
1414
default_pass_scheme = CRYPT
1515

1616
# password-query with prefetch

‎install/tpl/debian_dovecot-sql.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
#password_query = SELECT userid as user, password, home as userdb_home, uid as userdb_uid, gid as userdb_gid FROM users WHERE userid = '%u'
118118

119119
driver = mysql
120-
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password}
120+
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password} port={mysql_server_port}
121121
default_pass_scheme = CRYPT
122122

123123
# password-query with prefetch

0 commit comments

Comments
 (0)