Ori.livneh has submitted this change and it was merged.
Change subject: Remove MW_DBLISTS config vars
......................................................................
Remove MW_DBLISTS config vars
We always set MW_DBLISTS to MW_COMMON and MW_DBLISTS_SOURCE to
MW_COMMON_SOURCE now. So remove the aliases and replace them with MW_COMMON*.
Change-Id: Id750c380527324945bad77d0bae23a8268c48440
---
M files/misc/scripts/foreachwiki
M files/misc/scripts/mwscriptwikiset
M files/misc/scripts/mwscriptwikiset-quiet
M files/misc/scripts/update-special-pages
M files/misc/scripts/wikimedia-periodic-update.sh
M manifests/misc/deployment.pp
M templates/misc/mw-deployment-vars.erb
7 files changed, 9 insertions(+), 13 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
Filippo Giunchedi: Looks good to me, but someone else must approve
diff --git a/files/misc/scripts/foreachwiki b/files/misc/scripts/foreachwiki
index c903f91..cc46729 100755
--- a/files/misc/scripts/foreachwiki
+++ b/files/misc/scripts/foreachwiki
@@ -10,6 +10,6 @@
#
# On production the call will return all.dblist
# On labs: all-labs.dblist
-ALL_DBLIST=$(getRealmSpecificFilename $MW_DBLISTS_SOURCE'/all.dblist')
+ALL_DBLIST=$(getRealmSpecificFilename $MW_COMMON_SOURCE'/all.dblist')
exec "$(dirname "$0")/foreachwikiindblist" "$ALL_DBLIST" "${@}"
diff --git a/files/misc/scripts/mwscriptwikiset
b/files/misc/scripts/mwscriptwikiset
index f9c8e1c..35a2826 100755
--- a/files/misc/scripts/mwscriptwikiset
+++ b/files/misc/scripts/mwscriptwikiset
@@ -19,8 +19,8 @@
exit 1
fi
-if [ ! -f $MW_DBLISTS/$LISTFILE ]; then
- echo "The specified dblist file, $MW_DBLISTS/$LISTFILE, could not be
found."
+if [ ! -f $MW_COMMON/$LISTFILE ]; then
+ echo "The specified dblist file, $MW_COMMON/$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 $MW_DBLISTS/$LISTFILE)
+for DBNAME in $(cat $MW_COMMON/$LISTFILE)
do
echo "-------------------------------------"
echo "$DBNAME"
diff --git a/files/misc/scripts/mwscriptwikiset-quiet
b/files/misc/scripts/mwscriptwikiset-quiet
index f3bd3c8..2ca7682 100755
--- a/files/misc/scripts/mwscriptwikiset-quiet
+++ b/files/misc/scripts/mwscriptwikiset-quiet
@@ -18,8 +18,8 @@
exit 1
fi
-if [ ! -f $MW_DBLISTS/$LISTFILE ]; then
- echo "The specified dblist file, $MW_DBLISTS/$LISTFILE, could not be
found."
+if [ ! -f $MW_COMMON/$LISTFILE ]; then
+ echo "The specified dblist file, $MW_COMMON/$LISTFILE, could not be
found."
exit 1
fi
@@ -30,7 +30,7 @@
SCRIPTARGS="${SCRIPTARGS[@]}"
# Run the script on all wikis in the dblist
-for DBNAME in $(cat $MW_DBLISTS/$LISTFILE)
+for DBNAME in $(cat $MW_COMMON/$LISTFILE)
do
RES=$(mwscript "$SCRIPTFILE" "$DBNAME" $SCRIPTARGS)
test $? -gt 128 && break; # make Ctrl-C actually work
diff --git a/files/misc/scripts/update-special-pages
b/files/misc/scripts/update-special-pages
index 821ebdd..f4cc17e 100755
--- a/files/misc/scripts/update-special-pages
+++ b/files/misc/scripts/update-special-pages
@@ -3,7 +3,7 @@
. /usr/local/lib/mw-deployment-vars.sh
cd "$MW_COMMON/multiversion"
-for db in `<"$MW_DBLISTS/all.dblist"`; do
+for db in `<"$MW_COMMON/all.dblist"`; do
echo $db
php MWScript.php updateSpecialPages.php $db
echo
diff --git a/files/misc/scripts/wikimedia-periodic-update.sh
b/files/misc/scripts/wikimedia-periodic-update.sh
index c4deb46..5c16eee 100644
--- a/files/misc/scripts/wikimedia-periodic-update.sh
+++ b/files/misc/scripts/wikimedia-periodic-update.sh
@@ -1,7 +1,7 @@
#!/bin/bash
. /usr/local/lib/mw-deployment-vars.sh
-for db in `<"$MW_DBLISTS/flaggedrevs.dblist"`;do
+for db in `<"$MW_COMMON/flaggedrevs.dblist"`;do
echo $db
php $MW_COMMON/multiversion/MWScript.php
extensions/FlaggedRevs/maintenance/updateStats.php $db
done
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 1b4a36f..1c245c1 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -288,8 +288,6 @@
class misc::deployment::vars {
$mw_common = '/srv/mediawiki'
$mw_common_source = '/a/common'
- $dblist_common = $mw_common
- $dblist_common_source = $mw_common_source
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
diff --git a/templates/misc/mw-deployment-vars.erb
b/templates/misc/mw-deployment-vars.erb
index 0c9ed2a..fd5bf7f 100644
--- a/templates/misc/mw-deployment-vars.erb
+++ b/templates/misc/mw-deployment-vars.erb
@@ -2,8 +2,6 @@
PATH="$PATH:/srv/deployment/scap/scap/bin"
MW_COMMON="<%= @mw_common %>"
MW_COMMON_SOURCE="<%= @mw_common_source %>"
-MW_DBLISTS="<%= @dblist_common %>"
-MW_DBLISTS_SOURCE="<%= @dblist_common_source %>"
MW_CRON_LOGS="/home/wikipedia/logs/norotate"
MW_RSYNC_HOST="<%= @mw_rsync_host %>"
MW_DSH_ARGS=('-cM' '-g' 'mediawiki-installation' '-o' '-oSetupTimeout=30'
'-F30')
--
To view, visit https://gerrit.wikimedia.org/r/159645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id750c380527324945bad77d0bae23a8268c48440
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
