Tim Landscheidt has uploaded a new change for review. (
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(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/340059/1
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index ebd3bfb..7bacac6 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -400,7 +400,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/bin/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: newchange
Gerrit-Change-Id: I6a3dabcc6ea325eeb5d9a37054bacb819c5d6994
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
