Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/147167
Change subject: mediawiki: profile.d script to add scap to $PATH
......................................................................
mediawiki: profile.d script to add scap to $PATH
So that we don't need to plop symlinks in /usr/bin/local.
Change-Id: Ic2723f13552a9b0bd7a56379c87f968e1d184d9b
---
A modules/mediawiki/files/profile.d_add_scap_to_path.sh
M modules/mediawiki/manifests/sync.pp
2 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/147167/1
diff --git a/modules/mediawiki/files/profile.d_add_scap_to_path.sh
b/modules/mediawiki/files/profile.d_add_scap_to_path.sh
new file mode 100644
index 0000000..1060de4
--- /dev/null
+++ b/modules/mediawiki/files/profile.d_add_scap_to_path.sh
@@ -0,0 +1,4 @@
+# Add scap to $PATH for non-root wikidevs
+if [ "$(id -u)" -ne "0" ] && (groups $USER | grep -q ' wikidev\b'); then
+ export PATH="$PATH:/srv/deployment/scap/scap/bin"
+fi
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index 6f1d5bc..ae37eba 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -4,6 +4,10 @@
deployment::target { 'scap': }
+ file { '/etc/profile.d/add_scap_to_path.sh':
+ source => 'puppet:///modules/mediawiki/profile.d_add_scap_to_path.sh',
+ }
+
file { '/usr/local/bin/mwversionsinuse':
ensure => link,
target => '/srv/deployment/scap/scap/bin/mwversionsinuse',
--
To view, visit https://gerrit.wikimedia.org/r/147167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2723f13552a9b0bd7a56379c87f968e1d184d9b
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
