Ori.livneh has submitted this change and it was merged.
Change subject: Add dblist to many paths
......................................................................
Add dblist to many paths
Change-Id: Iad615eb303ec0bf1fad09853d665ee928f13ef1e
---
M modules/beta/files/wmf-beta-update-databases.py
M modules/mediawiki/files/maintenance/update-special-pages
M modules/mediawiki/files/maintenance/wikimedia-periodic-update.sh
M modules/scap/files/foreachwiki
M modules/scap/files/l10nupdate-1
M modules/scap/files/manpages/asciidoc/foreachwiki.txt
M modules/scap/files/manpages/man/foreachwiki.1
M modules/scap/files/mwgrep
M modules/scap/files/mwscriptwikiset
M modules/snapshot/manifests/dumps/configs.pp
M modules/snapshot/templates/addschanges.conf.erb
M modules/snapshot/templates/create-mediadir-list.sh.erb
M modules/snapshot/templates/wikidump.conf.erb
M modules/snapshot/templates/wq.conf.media.erb
14 files changed, 24 insertions(+), 24 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/beta/files/wmf-beta-update-databases.py
b/modules/beta/files/wmf-beta-update-databases.py
index a4b08e9..8795365 100755
--- a/modules/beta/files/wmf-beta-update-databases.py
+++ b/modules/beta/files/wmf-beta-update-databases.py
@@ -20,7 +20,7 @@
def get_default_dblist():
- return os.path.join(get_staging_dir(), 'all-labs.dblist')
+ return os.path.join(get_staging_dir(), 'dblists', 'all-labs.dblist')
def do_wait(procs):
diff --git a/modules/mediawiki/files/maintenance/update-special-pages
b/modules/mediawiki/files/maintenance/update-special-pages
index 0892bd6..eb78fe5 100755
--- a/modules/mediawiki/files/maintenance/update-special-pages
+++ b/modules/mediawiki/files/maintenance/update-special-pages
@@ -3,7 +3,7 @@
. /etc/profile.d/mediawiki.sh
cd "$MEDIAWIKI_DEPLOYMENT_DIR/multiversion"
-for db in `<"$MEDIAWIKI_DEPLOYMENT_DIR/all.dblist"`; do
+for db in `<"$MEDIAWIKI_DEPLOYMENT_DIR/dblists/all.dblist"`; do
echo $db
php MWScript.php updateSpecialPages.php $db
echo
diff --git a/modules/mediawiki/files/maintenance/wikimedia-periodic-update.sh
b/modules/mediawiki/files/maintenance/wikimedia-periodic-update.sh
index 70808e2..9eefb19 100644
--- a/modules/mediawiki/files/maintenance/wikimedia-periodic-update.sh
+++ b/modules/mediawiki/files/maintenance/wikimedia-periodic-update.sh
@@ -1,7 +1,7 @@
#!/bin/bash
. /etc/profile.d/mediawiki.sh
-for db in `<"$MEDIAWIKI_DEPLOYMENT_DIR/flaggedrevs.dblist"`;do
+for db in `<"$MEDIAWIKI_DEPLOYMENT_DIR/dblists/flaggedrevs.dblist"`;do
echo $db
php $MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php
extensions/FlaggedRevs/maintenance/updateStats.php $db
done
diff --git a/modules/scap/files/foreachwiki b/modules/scap/files/foreachwiki
index b9359fd..c3ef5cc 100755
--- a/modules/scap/files/foreachwiki
+++ b/modules/scap/files/foreachwiki
@@ -20,6 +20,6 @@
#
# On production the call will return all.dblist
# On labs: all-labs.dblist
-ALL_DBLIST=$(getRealmSpecificFilename $MEDIAWIKI_STAGING_DIR'/all.dblist')
+ALL_DBLIST=$(getRealmSpecificFilename
$MEDIAWIKI_STAGING_DIR'/dblists/all.dblist')
exec "$(dirname "$0")/foreachwikiindblist" "$ALL_DBLIST" "${@}"
diff --git a/modules/scap/files/l10nupdate-1 b/modules/scap/files/l10nupdate-1
index 97a69d9..b5288cf 100755
--- a/modules/scap/files/l10nupdate-1
+++ b/modules/scap/files/l10nupdate-1
@@ -127,7 +127,7 @@
# Clear the ResourceLoader cached messages
echo "Refreshing ResourceLoader caches"
-ALLDB=`getRealmSpecificFilename "$MEDIAWIKI_STAGING_DIR/all.dblist"`
+ALLDB=`getRealmSpecificFilename "$MEDIAWIKI_STAGING_DIR/dblists/all.dblist"`
for wiki in `<"$ALLDB"`; do
/usr/local/bin/mwscript
extensions/WikimediaMaintenance/refreshMessageBlobs.php --wiki="$wiki"
done
diff --git a/modules/scap/files/manpages/asciidoc/foreachwiki.txt
b/modules/scap/files/manpages/asciidoc/foreachwiki.txt
index 5343536..29cb499 100644
--- a/modules/scap/files/manpages/asciidoc/foreachwiki.txt
+++ b/modules/scap/files/manpages/asciidoc/foreachwiki.txt
@@ -16,7 +16,7 @@
MediaWiki maintenance script on all the wiki we are hosting. `SCRIPTNAME`
should
be the name of a script relative to the MediaWiki `maintenance` directory on
all the wiki. It acquires the list of wiki using the hardcoded dblist
-`/srv/mediawiki-staging/all.dblist`.
+`/srv/mediawiki-staging/dblists/all.dblist`.
Output is prefixed with the entry listed in `all.dblist`.
diff --git a/modules/scap/files/manpages/man/foreachwiki.1
b/modules/scap/files/manpages/man/foreachwiki.1
index 7ebe190..ba7ff8c 100644
--- a/modules/scap/files/manpages/man/foreachwiki.1
+++ b/modules/scap/files/manpages/man/foreachwiki.1
@@ -36,7 +36,7 @@
.fi
.SH "DESCRIPTION"
.sp
-foreachwiki(8) is a simple wrapper around MediaWiki multiversion to run a
MediaWiki maintenance script on all the wiki we are hosting\&. SCRIPTNAME
should be the name of a script relative to the MediaWiki maintenance directory
on all the wiki\&. It acquires the list of wiki using the hardcoded dblist
/srv/mediawiki\-staging/all\&.dblist\&.
+foreachwiki(8) is a simple wrapper around MediaWiki multiversion to run a
MediaWiki maintenance script on all the wiki we are hosting\&. SCRIPTNAME
should be the name of a script relative to the MediaWiki maintenance directory
on all the wiki\&. It acquires the list of wiki using the hardcoded dblist
/srv/mediawiki\-staging/dblists/all\&.dblist\&.
.sp
Output is prefixed with the entry listed in all\&.dblist\&.
.sp
diff --git a/modules/scap/files/mwgrep b/modules/scap/files/mwgrep
index c49784a..544d690 100755
--- a/modules/scap/files/mwgrep
+++ b/modules/scap/files/mwgrep
@@ -114,7 +114,7 @@
req = urllib2.urlopen(uri, json.dumps(search))
result = json.load(req)['hits']
-private_wikis = open('/srv/mediawiki/private.dblist').read().splitlines()
+private_wikis =
open('/srv/mediawiki/dblists/private.dblist').read().splitlines()
for hit in result['hits']:
db_name = hit['_index'].rsplit('_', 2)[0]
diff --git a/modules/scap/files/mwscriptwikiset
b/modules/scap/files/mwscriptwikiset
index 1b5cfc6..3222071 100755
--- a/modules/scap/files/mwscriptwikiset
+++ b/modules/scap/files/mwscriptwikiset
@@ -20,7 +20,7 @@
fi
if [ ! -f $MEDIAWIKI_DEPLOYMENT_DIR/$LISTFILE ]; then
- echo "The specified dblist file, $MEDIAWIKI_DEPLOYMENT_DIR/$LISTFILE,
could not be found."
+ echo "The specified dblist file,
$MEDIAWIKI_DEPLOYMENT_DIR/dblist/$LISTFILE, could not be found."
exit 1
fi
@@ -31,7 +31,7 @@
SCRIPTARGS="${SCRIPTARGS[@]}"
# Run the script on all wikis in the dblist
-for DBNAME in $(cat $MEDIAWIKI_DEPLOYMENT_DIR/$LISTFILE)
+for DBNAME in $(cat $MEDIAWIKI_DEPLOYMENT_DIR/dblists/$LISTFILE)
do
echo "-------------------------------------"
echo "$DBNAME"
diff --git a/modules/snapshot/manifests/dumps/configs.pp
b/modules/snapshot/manifests/dumps/configs.pp
index 5b9e7d0..b34d496 100644
--- a/modules/snapshot/manifests/dumps/configs.pp
+++ b/modules/snapshot/manifests/dumps/configs.pp
@@ -7,7 +7,7 @@
$config = {
smallwikis => {
- dblist => "${snapshot::dirs::apachedir}/all.dblist",
+ dblist => "${snapshot::dirs::apachedir}/dblists/all.dblist",
skipdblist => "${snapshot::dirs::dumpsdir}/dblists/skip.dblist",
keep => '12',
chunksEnabled => '0',
diff --git a/modules/snapshot/templates/addschanges.conf.erb
b/modules/snapshot/templates/addschanges.conf.erb
index b0b5474..5a04203 100644
--- a/modules/snapshot/templates/addschanges.conf.erb
+++ b/modules/snapshot/templates/addschanges.conf.erb
@@ -7,9 +7,9 @@
[wiki]
mediawiki=<%= scope.lookupvar('snapshot::dirs::apachedir') %>
-allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/all.dblist
-privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/private.dblist
-closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/closed.dblist
+allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/all.dblist
+privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/private.dblist
+closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/closed.dblist
adminsettings=private/PrivateSettings.php
[output]
diff --git a/modules/snapshot/templates/create-mediadir-list.sh.erb
b/modules/snapshot/templates/create-mediadir-list.sh.erb
index 6e20a53..727aed4 100755
--- a/modules/snapshot/templates/create-mediadir-list.sh.erb
+++ b/modules/snapshot/templates/create-mediadir-list.sh.erb
@@ -11,9 +11,9 @@
# generate the new file
python <%= scope.lookupvar('snapshot::dirs::wikiqueriesdir')
-%>/listwikiuploaddirs.py \
- --allwikis <%= scope.lookupvar('snapshot::dirs::apachedir') -%>/all.dblist
\
- --closedwikis <%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/closed.dblist \
- --privatewikis <%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/private.dblist \
+ --allwikis <%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/all.dblist \
+ --closedwikis <%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/closed.dblist \
+ --privatewikis <%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/private.dblist \
--wmfhack --multiversion \
--scriptpath <%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/multiversion \
> "${outputdir}${outputfile}.${DATE}"
diff --git a/modules/snapshot/templates/wikidump.conf.erb
b/modules/snapshot/templates/wikidump.conf.erb
index a773556..9d72722 100644
--- a/modules/snapshot/templates/wikidump.conf.erb
+++ b/modules/snapshot/templates/wikidump.conf.erb
@@ -5,11 +5,11 @@
[wiki]
dblist=<%= @config[@configtype]['dblist'] %>
-privatelist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/private.dblist
-flaggedrevslist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/flaggedrevs.dblist
-biglist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/big.dblist
+privatelist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/private.dblist
+flaggedrevslist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/flaggedrevs.dblist
+biglist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/dblists/big.dblist
skipdblist=<%= @config[@configtype]['skipdblist'] %>
-wikidatalist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/wikidata.dblist
+wikidatalist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/wikidata.dblist
globalusagelist=<%= scope.lookupvar('snapshot::dirs::dumpsdir')
-%>/dblists/globalusage.dblist
dir=<%= scope.lookupvar('snapshot::dirs::apachedir') %>
adminsettings=private/PrivateSettings.php
diff --git a/modules/snapshot/templates/wq.conf.media.erb
b/modules/snapshot/templates/wq.conf.media.erb
index b67976c..5b54c6d 100644
--- a/modules/snapshot/templates/wq.conf.media.erb
+++ b/modules/snapshot/templates/wq.conf.media.erb
@@ -4,9 +4,9 @@
#############################################################
[wiki]
mediawiki=<%= scope.lookupvar('snapshot::dirs::apachedir') %>
-allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/all.dblist
-privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/private.dblist
-closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/closed.dblist
+allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/all.dblist
+privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/private.dblist
+closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/closed.dblist
adminsettings=private/PrivateSettings.php
skipwikislist=<%= scope.lookupvar('snapshot::dirs::wikiqueriesdir')
-%>/dblists/skip.dblist
--
To view, visit https://gerrit.wikimedia.org/r/244743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad615eb303ec0bf1fad09853d665ee928f13ef1e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Ori.livneh <[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
