Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/159643

Change subject: foreachwikiindblist: check groups before attempting to sudo
......................................................................

foreachwikiindblist: check groups before attempting to sudo

The approach is directly copied from files/misc/scripts/mwscript.
Fixes I29259bad8.

Change-Id: Ic41b22361247410c0df1df3ee56d2ef07d7d40ea
---
M files/misc/scripts/foreachwikiindblist
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/159643/1

diff --git a/files/misc/scripts/foreachwikiindblist 
b/files/misc/scripts/foreachwikiindblist
index cc80414..700f326 100755
--- a/files/misc/scripts/foreachwikiindblist
+++ b/files/misc/scripts/foreachwikiindblist
@@ -8,7 +8,11 @@
 
 for x in $DBLIST; do
        echo -----------------------------------------------------------------
-       echo $x 
+       echo $x
        echo -----------------------------------------------------------------
-       sudo -u apache php -ddisplay_errors=On 
$MW_COMMON/multiversion/MWScript.php $CMD --wiki=$x "${@}" | sed -u "s/^/$x:  /"
+       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:  /"
+       else
+               php -ddisplay_errors=On $MW_COMMON/multiversion/MWScript.php 
$CMD --wiki=$x "${@}" | sed -u "s/^/$x:  /"
+       fi
 done

-- 
To view, visit https://gerrit.wikimedia.org/r/159643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic41b22361247410c0df1df3ee56d2ef07d7d40ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to