jenkins-bot has submitted this change and it was merged.
Change subject: make-all-blobs: Password from MW (i.e. ultimately
PrivateSettings.php)
......................................................................
make-all-blobs: Password from MW (i.e. ultimately PrivateSettings.php)
wikiadmin_pass does not exist anymore.
Bug: T95871
Change-Id: Id5ac4b8b14175d7112abb000a683bb49e1f1da9e
---
M storage/make-all-blobs
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/storage/make-all-blobs b/storage/make-all-blobs
index 9a955eb..8f93447 100755
--- a/storage/make-all-blobs
+++ b/storage/make-all-blobs
@@ -16,9 +16,10 @@
FILE="$MEDIAWIKI_STAGING_DIR/dblists/all.dblist"
fi
-# Note, wikiadmin_pass no longer exists, so the password has to be set
manually.
-for db in `<$FILE`;do
- echo "CREATE DATABASE IF NOT EXISTS $db" | mysql -u wikiadmin
-p`wikiadmin_pass` -h $server && \
- sed "s/blobs\>/$table/" blobs.sql | mysql -u wikiadmin
-p`wikiadmin_pass` -h $server $db
-done
+# Assumes password is the same everywhere
+pass=$(echo 'echo $wgDBadminpassword;' | mwscript eval.php --wiki="enwiki");
+for db in `<$FILE`;do
+ echo "CREATE DATABASE IF NOT EXISTS $db" | mysql -u wikiadmin "-p$pass"
-h $server && \
+ sed "s/blobs\>/$table/" blobs.sql | mysql -u wikiadmin "-p$pass" -h
$server $db
+done
--
To view, visit https://gerrit.wikimedia.org/r/275680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5ac4b8b14175d7112abb000a683bb49e1f1da9e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
