[MediaWiki-commits] [Gerrit] Rename MW_COMMON{_SOURCE} vars - change (operations/puppet)

Ori.livneh (Code Review) Fri, 12 Sep 2014 11:28:38 -0700

Ori.livneh has submitted this change and it was merged.

Change subject: Rename MW_COMMON{_SOURCE} vars
......................................................................



Rename MW_COMMON{_SOURCE} vars

* MW_COMMON -> MEDIAWIKI_DEPLOYMENT_DIR
* MW_COMMON_SOURCE -> MEDIAWIKI_STAGING_DIR
* /a/common -> /srv/mediawiki-staging
* Preserve old aliases for back-compat.

Change-Id: Ib573b55c1ec686e3c3588c2e5b06dd998a75bc8a
---
M files/misc/l10nupdate/l10nupdate-1
M files/misc/l10nupdate/sync-l10nupdate-1
M files/misc/scripts/foreachwiki
M files/misc/scripts/foreachwikiindblist
M files/misc/scripts/mwscript
M files/misc/scripts/mwscriptwikiset
M files/misc/scripts/mwscriptwikiset-quiet
M files/misc/scripts/refreshWikiversionsCDB
M files/misc/scripts/set-group-write2
M files/misc/scripts/sql
M files/misc/scripts/sqldump
M files/misc/scripts/update-special-pages
M files/misc/scripts/updateinterwikicache
M files/misc/scripts/wikimedia-periodic-update.sh
M manifests/misc/deployment.pp
M modules/admin/files/home/ori/.hosts/tin
M modules/admin/files/home/tstarling/.bashrc
M templates/misc/mw-deployment-vars.erb
18 files changed, 53 insertions(+), 44 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/misc/l10nupdate/l10nupdate-1 
b/files/misc/l10nupdate/l10nupdate-1
index 3a29274..b749a62 100755
--- a/files/misc/l10nupdate/l10nupdate-1
+++ b/files/misc/l10nupdate/l10nupdate-1
@@ -1,10 +1,10 @@
 #!/bin/bash
 # This script belongs in /usr/local/bin/.
 . /usr/local/lib/mw-deployment-vars.sh
-. $MW_COMMON_SOURCE/multiversion/MWRealm.sh
+. $MEDIAWIKI_STAGING_DIR/multiversion/MWRealm.sh
 
 BINDIR=/usr/local/bin
-MWMULTIDIR=$MW_COMMON_SOURCE/multiversion
+MWMULTIDIR=$MEDIAWIKI_STAGING_DIR/multiversion
 # The configuration in CommonSettings.php should match GITDIR and GITREPOS
 GITDIR=/var/lib/l10nupdate/mediawiki
 GITURL=https://gerrit.wikimedia.org/r/p/mediawiki
@@ -92,10 +92,10 @@
                        --wiki="$mwDbName" \
                        --outdir=/var/lib/l10nupdate/cache-${mwVerNum} $QUIET
                # Copy the LC files
-               echo "Completed at `date --rfc-3339=seconds`. Copying LC files 
to $MW_COMMON_SOURCE"
-               cp --preserve=timestamps --force 
/var/lib/l10nupdate/cache-"$mwVerNum"/l10n_cache-* 
$MW_COMMON_SOURCE/php-"$mwVerNum"/cache/l10n
+               echo "Completed at `date --rfc-3339=seconds`. Copying LC files 
to $MEDIAWIKI_STAGING_DIR"
+               cp --preserve=timestamps --force 
/var/lib/l10nupdate/cache-"$mwVerNum"/l10n_cache-* 
$MEDIAWIKI_STAGING_DIR/php-"$mwVerNum"/cache/l10n
                # Include JSON versions of the CDB files and add MD5 files
-               refreshCdbJsonFiles 
--directory="$MW_COMMON_SOURCE/php-$mwVerNum/cache/l10n"
+               refreshCdbJsonFiles 
--directory="$MEDIAWIKI_STAGING_DIR/php-$mwVerNum/cache/l10n"
 
                echo "Syncing to Apaches at `date --rfc-3339=seconds`"
                SYNC_START=$(date +%s)
@@ -112,7 +112,7 @@
 
 # Clear the ResourceLoader cached messages
 echo "Refreshing ResourceLoader caches"
-ALLDB=`getRealmSpecificFilename "$MW_COMMON_SOURCE/all.dblist"`
+ALLDB=`getRealmSpecificFilename "$MEDIAWIKI_STAGING_DIR/all.dblist"`
 for wiki in `<"$ALLDB"`; do
        /usr/local/bin/mwscript 
extensions/WikimediaMaintenance/refreshMessageBlobs.php --wiki="$wiki"
 done
diff --git a/files/misc/l10nupdate/sync-l10nupdate-1 
b/files/misc/l10nupdate/sync-l10nupdate-1
index 4fdcaf3..ba2c1db 100755
--- a/files/misc/l10nupdate/sync-l10nupdate-1
+++ b/files/misc/l10nupdate/sync-l10nupdate-1
@@ -9,9 +9,9 @@
        exit 1
 fi
 
-echo "Synchronizing $MW_COMMON_SOURCE/php-$MWVER/cache/l10n to 
$MW_COMMON/php-$MWVER/cache/l10n..."
+echo "Synchronizing $MEDIAWIKI_STAGING_DIR/php-$MWVER/cache/l10n to 
$MEDIAWIKI_DEPLOYMENT_DIR/php-$MWVER/cache/l10n..."
 echo "mediawiki-installation:"
 
 # Set forklimit to 30 (-F 30) to prevent NFS from getting overloaded causing 
some machines to be skipped
 dsh -o -oPasswordAuthentication=no -F 30 -cM -g mediawiki-installation \
-  "sudo -u mwdeploy rsync -a $MW_RSYNC_HOST::common/php-$MWVER/cache/l10n/ 
$MW_COMMON/php-$MWVER/cache/l10n"
+  "sudo -u mwdeploy rsync -a $MW_RSYNC_HOST::common/php-$MWVER/cache/l10n/ 
$MEDIAWIKI_DEPLOYMENT_DIR/php-$MWVER/cache/l10n"
diff --git a/files/misc/scripts/foreachwiki b/files/misc/scripts/foreachwiki
index cc46729..1506797 100755
--- a/files/misc/scripts/foreachwiki
+++ b/files/misc/scripts/foreachwiki
@@ -3,13 +3,13 @@
 . /usr/local/lib/mw-deployment-vars.sh
 
 # Let us vary mediawiki-config files by realm
-. $MW_COMMON_SOURCE/multiversion/MWRealm.sh
+. $MEDIAWIKI_STAGING_DIR/multiversion/MWRealm.sh
 
 # Get the all.dblist to be used depending on the realm we are on. This is made
 # possible by multiversion/MWRealm.sh
 #
 # On production the call will return all.dblist
 # On labs: all-labs.dblist
-ALL_DBLIST=$(getRealmSpecificFilename $MW_COMMON_SOURCE'/all.dblist')
+ALL_DBLIST=$(getRealmSpecificFilename $MEDIAWIKI_STAGING_DIR'/all.dblist')
 
 exec "$(dirname "$0")/foreachwikiindblist" "$ALL_DBLIST" "${@}"
diff --git a/files/misc/scripts/foreachwikiindblist 
b/files/misc/scripts/foreachwikiindblist
index 700f326..e6a915b 100755
--- a/files/misc/scripts/foreachwikiindblist
+++ b/files/misc/scripts/foreachwikiindblist
@@ -11,8 +11,8 @@
        echo $x
        echo -----------------------------------------------------------------
        if groups | grep -Ewq 'sudo|wikidev|root'; then
-               sudo -u apache php -ddisplay_errors=On 
$MW_COMMON/multiversion/MWScript.php $CMD --wiki=$x "${@}" | sed -u "s/^/$x:  /"
+               sudo -u apache php -ddisplay_errors=On 
$MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php $CMD --wiki=$x "${@}" | sed 
-u "s/^/$x:  /"
        else
-               php -ddisplay_errors=On $MW_COMMON/multiversion/MWScript.php 
$CMD --wiki=$x "${@}" | sed -u "s/^/$x:  /"
+               php -ddisplay_errors=On 
$MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php $CMD --wiki=$x "${@}" | sed 
-u "s/^/$x:  /"
        fi
 done
diff --git a/files/misc/scripts/mwscript b/files/misc/scripts/mwscript
index bdb2733..c07ed5d 100755
--- a/files/misc/scripts/mwscript
+++ b/files/misc/scripts/mwscript
@@ -5,14 +5,14 @@
 
 # Use the source version of the script if the source directory is present.
 # This only matters if the source dir is shared or when run on the deployment 
server.
-if [ -d "$MW_COMMON_SOURCE" ]; then
-       MW_COMMON_DIR_USE=$MW_COMMON_SOURCE
+if [ -d "$MEDIAWIKI_STAGING_DIR" ]; then
+       MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE=$MEDIAWIKI_STAGING_DIR
 else
-       MW_COMMON_DIR_USE=$MW_COMMON
+       MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE=$MEDIAWIKI_DEPLOYMENT_DIR
 fi
 
 if groups | grep -Ewq 'sudo|wikidev|root'; then
-       sudo -u apache php "$MW_COMMON_DIR_USE/multiversion/MWScript.php" "$@"
+       sudo -u apache php 
"$MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE/multiversion/MWScript.php" "$@"
 else
-       php "$MW_COMMON_DIR_USE/multiversion/MWScript.php" "$@"
+       php "$MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE/multiversion/MWScript.php" "$@"
 fi
diff --git a/files/misc/scripts/mwscriptwikiset 
b/files/misc/scripts/mwscriptwikiset
index 35a2826..421bf07 100755
--- a/files/misc/scripts/mwscriptwikiset
+++ b/files/misc/scripts/mwscriptwikiset
@@ -19,8 +19,8 @@
        exit 1
 fi
 
-if [ ! -f $MW_COMMON/$LISTFILE ]; then
-       echo "The specified dblist file, $MW_COMMON/$LISTFILE, could not be 
found."
+if [ ! -f $MEDIAWIKI_DEPLOYMENT_DIR/$LISTFILE ]; then
+       echo "The specified dblist file, $MEDIAWIKI_DEPLOYMENT_DIR/$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_COMMON/$LISTFILE)
+for DBNAME in $(cat $MEDIAWIKI_DEPLOYMENT_DIR/$LISTFILE)
 do
        echo "-------------------------------------"
        echo "$DBNAME"
diff --git a/files/misc/scripts/mwscriptwikiset-quiet 
b/files/misc/scripts/mwscriptwikiset-quiet
index 2ca7682..142eb84 100755
--- a/files/misc/scripts/mwscriptwikiset-quiet
+++ b/files/misc/scripts/mwscriptwikiset-quiet
@@ -18,8 +18,8 @@
        exit 1
 fi
 
-if [ ! -f $MW_COMMON/$LISTFILE ]; then
-       echo "The specified dblist file, $MW_COMMON/$LISTFILE, could not be 
found."
+if [ ! -f $MEDIAWIKI_DEPLOYMENT_DIR/$LISTFILE ]; then
+       echo "The specified dblist file, $MEDIAWIKI_DEPLOYMENT_DIR/$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_COMMON/$LISTFILE)
+for DBNAME in $(cat $MEDIAWIKI_DEPLOYMENT_DIR/$LISTFILE)
 do
        RES=$(mwscript "$SCRIPTFILE" "$DBNAME" $SCRIPTARGS)
        test $? -gt 128 && break; # make Ctrl-C actually work
diff --git a/files/misc/scripts/refreshWikiversionsCDB 
b/files/misc/scripts/refreshWikiversionsCDB
index 5d91c5f..2b92f5c 100755
--- a/files/misc/scripts/refreshWikiversionsCDB
+++ b/files/misc/scripts/refreshWikiversionsCDB
@@ -3,4 +3,4 @@
 # This script belongs in /usr/bin/ and should be in PATH.
 
 . /usr/local/lib/mw-deployment-vars.sh
-exec php "$MW_COMMON_SOURCE/multiversion/refreshWikiVersionsCDB" "$@"
+exec php "$MEDIAWIKI_STAGING_DIR/multiversion/refreshWikiVersionsCDB" "$@"
diff --git a/files/misc/scripts/set-group-write2 
b/files/misc/scripts/set-group-write2
index 6b3ccbb..04970d9 100755
--- a/files/misc/scripts/set-group-write2
+++ b/files/misc/scripts/set-group-write2
@@ -4,8 +4,8 @@
 
 mwVersionNums=$(mwversionsinuse)
 for mwVerNum in ${mwVersionNums[@]}; do
-       find "$MW_COMMON_SOURCE"/php-"$mwVerNum" -group wikidev -not -perm -020 
-exec chmod g+w '{}' ';'
+       find "$MEDIAWIKI_STAGING_DIR"/php-"$mwVerNum" -group wikidev -not -perm 
-020 -exec chmod g+w '{}' ';'
 done
 
-find "$MW_COMMON_SOURCE"/wmf-config -group wikidev -not -perm -020 -exec chmod 
g+w '{}' ';'
-find "$MW_COMMON_SOURCE"/multiversion -group wikidev -not -perm -020 -exec 
chmod g+w '{}' ';'
+find "$MEDIAWIKI_STAGING_DIR"/wmf-config -group wikidev -not -perm -020 -exec 
chmod g+w '{}' ';'
+find "$MEDIAWIKI_STAGING_DIR"/multiversion -group wikidev -not -perm -020 
-exec chmod g+w '{}' ';'
diff --git a/files/misc/scripts/sql b/files/misc/scripts/sql
index 2f1cddf..2bcea9d 100755
--- a/files/misc/scripts/sql
+++ b/files/misc/scripts/sql
@@ -4,7 +4,7 @@
 
 # Read configuration.
 . /usr/local/lib/mw-deployment-vars.sh
-MWMULTIDIR=$MW_COMMON/multiversion
+MWMULTIDIR=$MEDIAWIKI_DEPLOYMENT_DIR/multiversion
 
 # Database that the user wants to use/query.
 db=$1
diff --git a/files/misc/scripts/sqldump b/files/misc/scripts/sqldump
index 10b6171..779be4c 100755
--- a/files/misc/scripts/sqldump
+++ b/files/misc/scripts/sqldump
@@ -3,7 +3,7 @@
 db=$1
 . /usr/local/lib/mw-deployment-vars.sh
 
-MWMULTIDIR=$MW_COMMON/multiversion
+MWMULTIDIR=$MEDIAWIKI_DEPLOYMENT_DIR/multiversion
 
 if [ -z $db ];then
        db=enwiki
diff --git a/files/misc/scripts/update-special-pages 
b/files/misc/scripts/update-special-pages
index f4cc17e..173f5ed 100755
--- a/files/misc/scripts/update-special-pages
+++ b/files/misc/scripts/update-special-pages
@@ -2,8 +2,8 @@
 
 . /usr/local/lib/mw-deployment-vars.sh
 
-cd "$MW_COMMON/multiversion"
-for db in `<"$MW_COMMON/all.dblist"`; do
+cd "$MEDIAWIKI_DEPLOYMENT_DIR/multiversion"
+for db in `<"$MEDIAWIKI_DEPLOYMENT_DIR/all.dblist"`; do
        echo $db
        php MWScript.php updateSpecialPages.php $db
        echo
diff --git a/files/misc/scripts/updateinterwikicache 
b/files/misc/scripts/updateinterwikicache
index ef65b9c..9eea9d6 100644
--- a/files/misc/scripts/updateinterwikicache
+++ b/files/misc/scripts/updateinterwikicache
@@ -1,8 +1,9 @@
 #!/bin/bash
+. /usr/local/lib/mw-deployment-vars.sh
 echo "Updating interwiki cache..."
 file=/tmp/interwiki-$(date +%s).cdb
 mwscript extensions/WikimediaMaintenance/dumpInterwiki.php -o $file 
--protocolrelative
-cp $file /a/common/wmf-config/interwiki.cdb
+cp $file "$MEDIAWIKI_STAGING_DIR/wmf-config/interwiki.cdb"
 sync-file wmf-config/interwiki.cdb Updating interwiki cache
 
 echo "Done"
diff --git a/files/misc/scripts/wikimedia-periodic-update.sh 
b/files/misc/scripts/wikimedia-periodic-update.sh
index 5c16eee..ee46ae2 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_COMMON/flaggedrevs.dblist"`;do
+for db in `<"$MEDIAWIKI_DEPLOYMENT_DIR/flaggedrevs.dblist"`;do
        echo $db
-       php $MW_COMMON/multiversion/MWScript.php 
extensions/FlaggedRevs/maintenance/updateStats.php $db
+       php $MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php 
extensions/FlaggedRevs/maintenance/updateStats.php $db
 done
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 1c245c1..1134cdb 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -287,7 +287,7 @@
 
 class misc::deployment::vars {
     $mw_common = '/srv/mediawiki'
-    $mw_common_source = '/a/common'
+    $mw_common_source = '/srv/mediawiki-staging'
 
     if $::realm == 'production' {
         $mw_rsync_host = 'tin.eqiad.wmnet'
diff --git a/modules/admin/files/home/ori/.hosts/tin 
b/modules/admin/files/home/ori/.hosts/tin
index cefbaf7..1d0a5a3 100755
--- a/modules/admin/files/home/ori/.hosts/tin
+++ b/modules/admin/files/home/ori/.hosts/tin
@@ -1,14 +1,16 @@
 #!/bin/bash
 
+. /usr/local/lib/mw-deployment-vars.sh
+
 looksgood () {
     ( git remote -v | grep -q mediawiki-config ) && { git merge origin/master; 
return; }
     dir=$(pwd)
-    branch="${dir#/a/common/php-}"
+    branch="${dir#/srv/mediawiki-staging/php-}"
     git rebase origin/wmf/$branch
 }
 
 fetch() {
-    cd /a/common
+    cd "$MEDIAWIKI_STAGING_DIR"
     if [ "$1" = "config" ]; then
         cd wmf-config
         git fetch origin
@@ -23,7 +25,7 @@
 }
 
 cdbranch() {
-    cd /a/common
+    cd "$MEDIAWIKI_STAGING_DIR"
     branch_dir=$(find . -maxdepth 1 -type d -iregex "./php-[0-9.]+wmf$1")
     cd "${branch_dir}"
 }
diff --git a/modules/admin/files/home/tstarling/.bashrc 
b/modules/admin/files/home/tstarling/.bashrc
index d4dc693..2cce11d 100644
--- a/modules/admin/files/home/tstarling/.bashrc
+++ b/modules/admin/files/home/tstarling/.bashrc
@@ -62,11 +62,11 @@
 
 if [ -e /usr/local/lib/mw-deployment-vars.sh ]; then
        . /usr/local/lib/mw-deployment-vars.sh
-       export ENWIKI_VERSION=`tr -cd 'a-zA-Z0-9-. \n' < 
$MW_COMMON/wikiversions.json | awk '$1 == "enwiki" {print $2}'`
-       if [ -e $MW_COMMON_SOURCE ]; then
-               export WIKI=$MW_COMMON_SOURCE/$ENWIKI_VERSION
+       export ENWIKI_VERSION=`tr -cd 'a-zA-Z0-9-. \n' < 
$MEDIAWIKI_DEPLOYMENT_DIR/wikiversions.json | awk '$1 == "enwiki" {print $2}'`
+       if [ -e $MEDIAWIKI_STAGING_DIR ]; then
+               export WIKI=$MEDIAWIKI_STAGING_DIR/$ENWIKI_VERSION
        else
-               export WIKI=$MW_COMMON/$ENWIKI_VERSION
+               export WIKI=$MEDIAWIKI_DEPLOYMENT_DIR/$ENWIKI_VERSION
        fi
 fi
 
diff --git a/templates/misc/mw-deployment-vars.erb 
b/templates/misc/mw-deployment-vars.erb
index fd5bf7f..3f3f3ca 100644
--- a/templates/misc/mw-deployment-vars.erb
+++ b/templates/misc/mw-deployment-vars.erb
@@ -1,7 +1,13 @@
 # This file should be BASH / Python polyglot.
 PATH="$PATH:/srv/deployment/scap/scap/bin"
-MW_COMMON="<%= @mw_common %>"
-MW_COMMON_SOURCE="<%= @mw_common_source %>"
+
+MEDIAWIKI_DEPLOYMENT_DIR="<%= @mw_common %>"
+MEDIAWIKI_STAGING_DIR="<%= @mw_common_source %>"
+
+# Back-compat aliases
+MW_COMMON="$MEDIAWIKI_DEPLOYMENT_DIR"
+MW_COMMON_SOURCE="$MEDIAWIKI_STAGING_DIR"
+
 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/160046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib573b55c1ec686e3c3588c2e5b06dd998a75bc8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[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

[MediaWiki-commits] [Gerrit] Rename MW_COMMON{_SOURCE} vars - change (operations/puppet)

Reply via email to