Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Execute scap-provided script as mediawiki::users::web
......................................................................
Execute scap-provided script as mediawiki::users::web
A couple of script used the user 'apache' and it was hardcoded
Bug: T89165
Change-Id: I8f527b45e19ba850d2efeb0ff202835a5d87c0cc
---
M modules/scap/manifests/scripts.pp
R modules/scap/templates/foreachwikiindblist.erb
R modules/scap/templates/mwscript.erb
3 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/scap/manifests/scripts.pp
b/modules/scap/manifests/scripts.pp
index 8120709..f5aa045 100644
--- a/modules/scap/manifests/scripts.pp
+++ b/modules/scap/manifests/scripts.pp
@@ -7,6 +7,7 @@
# FIXME: Why man pages for some but not all?
class scap::scripts {
require misc::deployment::passwordscripts
+ require mediawiki::users
package { ['libwww-perl', 'libnet-dns-perl']:
ensure => present;
@@ -39,15 +40,15 @@
mode => '0555',
source => 'puppet:///modules/scap/foreachwiki';
'/usr/local/bin/foreachwikiindblist':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/foreachwikiindblist';
- '/usr/local/bin/mwscript':
owner => 'root',
group => 'root',
mode => '0555',
- source => 'puppet:///modules/scap/mwscript';
+ content => template('scap/foreachwikiindblist.erb');
+ '/usr/local/bin/mwscript':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ content => template('scap/mwscript.erb');
'/usr/local/bin/mwscriptwikiset':
owner => 'root',
group => 'root',
diff --git a/modules/scap/files/foreachwikiindblist
b/modules/scap/templates/foreachwikiindblist.erb
similarity index 70%
rename from modules/scap/files/foreachwikiindblist
rename to modules/scap/templates/foreachwikiindblist.erb
index aa3073f..e731ec2 100755
--- a/modules/scap/files/foreachwikiindblist
+++ b/modules/scap/templates/foreachwikiindblist.erb
@@ -11,7 +11,7 @@
echo $x
echo -----------------------------------------------------------------
if groups | grep -Ewq 'sudo|wikidev|root'; then
- sudo -u apache php -ddisplay_errors=On
$MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php $CMD --wiki=$x "${@}" | sed
-u "s/^/$x: /"
+ sudo -u <%= scope.lookupvar('mediawiki::users::web') -%> php
-ddisplay_errors=On $MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php $CMD
--wiki=$x "${@}" | sed -u "s/^/$x: /"
else
php -ddisplay_errors=On
$MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php $CMD --wiki=$x "${@}" | sed
-u "s/^/$x: /"
fi
diff --git a/modules/scap/files/mwscript b/modules/scap/templates/mwscript.erb
similarity index 82%
rename from modules/scap/files/mwscript
rename to modules/scap/templates/mwscript.erb
index 95128c9..4b68aaf 100755
--- a/modules/scap/files/mwscript
+++ b/modules/scap/templates/mwscript.erb
@@ -12,7 +12,7 @@
fi
if groups | grep -Ewq 'sudo|wikidev|root'; then
- sudo -u apache php
"$MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE/multiversion/MWScript.php" "$@"
+ sudo -u <%= scope.lookupvar('mediawiki::users::web') -%> php
"$MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE/multiversion/MWScript.php" "$@"
else
php "$MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE/multiversion/MWScript.php" "$@"
fi
--
To view, visit https://gerrit.wikimedia.org/r/192286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f527b45e19ba850d2efeb0ff202835a5d87c0cc
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
