Filippo Giunchedi has submitted this change and it was merged.

Change subject: mediawiki: restore scap symlinks
......................................................................


mediawiki: restore scap symlinks

scap-rebuild-cdbs and sync-common are called via ssh by scap on a
non-interactive, non-login shell and thus won't get the right PATH

Change-Id: I54de584169e7566fbdcff6952c3e6bd263e6ab3b
---
M modules/mediawiki/manifests/sync.pp
1 file changed, 12 insertions(+), 0 deletions(-)

Approvals:
  BryanDavis: Looks good to me, but someone else must approve
  Filippo Giunchedi: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/mediawiki/manifests/sync.pp 
b/modules/mediawiki/manifests/sync.pp
index 33179ab..dd6d18f 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -45,4 +45,16 @@
         mode    => '0775',
         replace => false,
     }
+
+    # these get invoked by scap over SSH using a non-interactive, non-login
+    # shell thus won't pick up /etc/profile.d above
+    file { '/usr/local/bin/scap-rebuild-cdbs':
+        ensure => link,
+        target => '/srv/deployment/scap/scap/bin/scap-rebuild-cdbs',
+    }
+
+    file { '/usr/local/bin/sync-common':
+        ensure => link,
+        target => '/srv/deployment/scap/scap/bin/sync-common',
+    }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I54de584169e7566fbdcff6952c3e6bd263e6ab3b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to