Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349343 )
Change subject: Ensure mcrypt enabled on integration slaves
......................................................................
Ensure mcrypt enabled on integration slaves
All of the other extensions seem to be enabled just by installing
the deb, but for some reason mcrypt's trusty deb doesn't.
Change-Id: I033367172ae3ee28f266f5ca102bad4080b2dfa6
---
M modules/contint/manifests/packages/php.pp
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
Thcipriani: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/contint/manifests/packages/php.pp
b/modules/contint/manifests/packages/php.pp
index 6ab6f2c..5d4d1a6 100644
--- a/modules/contint/manifests/packages/php.pp
+++ b/modules/contint/manifests/packages/php.pp
@@ -73,4 +73,15 @@
ensure => present,
}
+ if os_version('ubuntu == trusty') {
+ # Enable mcrypt for PHP CLI.
+ # For most PHP extensions, the deb enables it on install, but not
+ # php-mcrypt on trusty.
+ exec { 'mcrypt':
+ command => '/usr/sbin/php5enmod mcrypt',
+ unless => '/usr/bin/php -m | /bin/grep -q mcrypt',
+ require => [Package['php5-mcrypt'], Package['php5-cli']],
+ }
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/349343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I033367172ae3ee28f266f5ca102bad4080b2dfa6
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
