Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404986 )
Change subject: Use a global mysql user if configured
......................................................................
Use a global mysql user if configured
This makes it easier to run under vagrant, where PrivateSettings.php doesn't
exist.
Change-Id: I44beb87f44cf26505107e199ba46123700872ee0
---
M xmldumps-backup/dumps/WikiDump.py
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/86/404986/1
diff --git a/xmldumps-backup/dumps/WikiDump.py
b/xmldumps-backup/dumps/WikiDump.py
index 77b86f0..cd5c33d 100644
--- a/xmldumps-backup/dumps/WikiDump.py
+++ b/xmldumps-backup/dumps/WikiDump.py
@@ -76,10 +76,17 @@
default_dbpassword = ""
if not conf.has_option("wiki", "adminsettings"):
+ # Fall back to global db user configuration if available.
+ if conf.has_option("database", "user"):
+ if conf.has_option("database", "password"):
+ return conf.get("database", "user"), conf.get("database",
"password")
+
+ # Fall back to defaults.
db_user = default_dbuser
db_password = default_dbpassword
return db_user, db_password
+ # Read db user from PrivateSettings.php
adminfhandle = open(os.path.join(wiki_dir, conf.get("wiki",
"adminsettings")), "r")
lines = adminfhandle.readlines()
adminfhandle.close()
--
To view, visit https://gerrit.wikimedia.org/r/404986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44beb87f44cf26505107e199ba46123700872ee0
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
