Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340059 )
Change subject: Tools: Fix test for enabled PHP module mcrypt
......................................................................
Tools: Fix test for enabled PHP module mcrypt
The current test erroneously assumes that the PHP SAPIs are always
called "apache2" and "cli". This change amends the test to check the
actually installed PHP SAPIs.
Bug: T159022
Change-Id: I6a3dabcc6ea325eeb5d9a37054bacb819c5d6994
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Rush: Looks good to me, approved
BryanDavis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index 53c73cb..9f6590c 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -372,7 +372,7 @@
# Enable PHP mcrypt module (T97857).
exec { 'tools_enable_php_mcrypt_module':
command => '/usr/sbin/php5enmod mcrypt',
- unless => '/usr/sbin/php5query -s apache2 -m mcrypt &&
/usr/sbin/php5query -s cli -m mcrypt',
+ unless => '/usr/sbin/php5query -S | /usr/bin/xargs -rI {}
/usr/sbin/php5query -s {} -m mcrypt',
require => Package['php5-cli', 'php5-mcrypt'],
}
} elsif $::lsbdistcodename == 'jessie' {
--
To view, visit https://gerrit.wikimedia.org/r/340059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a3dabcc6ea325eeb5d9a37054bacb819c5d6994
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Coren <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Madhuvishy <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
