Skip to content

Commit bc511c6

Browse files
authored
Only append ":3306" to $wgDBserver if it has no port already (#496)
* Only append ":3306" to $wgDBserver if it has no port already * Update run-maintenance-scripts.sh
1 parent 9bd35e1 commit bc511c6

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

_sources/scripts/run-maintenance-scripts.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ set -x
99

1010
WG_DB_TYPE=$(get_mediawiki_db_var wgDBtype)
1111
WG_DB_SERVER=$(get_mediawiki_db_var wgDBserver)
12+
if ! [[ $WG_DB_SERVER =~ ":" ]]; then
13+
WG_DB_SERVER+=":3306"
14+
fi
1215
WG_DB_NAME=$(get_mediawiki_db_var wgDBname)
1316
WG_DB_USER=$(get_mediawiki_db_var wgDBuser)
1417
WG_DB_PASSWORD=$(get_mediawiki_db_var wgDBpassword)
@@ -35,7 +38,7 @@ waitdatabase() {
3538
fi
3639

3740
echo >&2 "Waiting for database to start"
38-
/wait-for-it.sh -t 86400 "$WG_DB_SERVER:3306"
41+
/wait-for-it.sh -t 86400 "$WG_DB_SERVER"
3942

4043
mysql=( mysql -h "$WG_DB_SERVER" -u"$WG_DB_USER" -p"$WG_DB_PASSWORD" )
4144

@@ -277,4 +280,4 @@ else
277280
fi
278281

279282
sleep 4
280-
printf "\n\n>>>>> run-maintenance-scripts.sh <<<<<\n\n\n"
283+
printf "\n\n>>>>> run-maintenance-scripts.sh <<<<<\n\n\n"

0 commit comments

Comments
 (0)