Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/294037
Change subject: Only install PHP configuration files on trusty
......................................................................
Only install PHP configuration files on trusty
Change-Id: Ibbea40da58622a8dcfa6db6e01f5a576a910d503
---
M modules/mediawiki/manifests/php.pp
1 file changed, 17 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/294037/1
diff --git a/modules/mediawiki/manifests/php.pp
b/modules/mediawiki/manifests/php.pp
index 1c8814a..56efbd6 100644
--- a/modules/mediawiki/manifests/php.pp
+++ b/modules/mediawiki/manifests/php.pp
@@ -9,20 +9,24 @@
$php_module_conf_dir = '/etc/php5/mods-available'
mediawiki::php_enmod { ['mail']: }
- file { '/etc/php5/apache2/php.ini':
- source => 'puppet:///modules/mediawiki/php/php.ini',
- owner => 'root',
- group => 'root',
- mode => '0444',
- require => Package['php5-common'],
- }
+ # Only install PHP configuration files on Trusty, jessie onwards
+ # no longer installs Zend PHP
+ if os_version('ubuntu == trusty') {
+ file { '/etc/php5/apache2/php.ini':
+ source => 'puppet:///modules/mediawiki/php/php.ini',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ require => Package['php5-common'],
+ }
- file { '/etc/php5/cli/php.ini':
- source => 'puppet:///modules/mediawiki/php/php.ini.cli',
- owner => 'root',
- group => 'root',
- mode => '0444',
- require => Package['php5-cli'],
+ file { '/etc/php5/cli/php.ini':
+ source => 'puppet:///modules/mediawiki/php/php.ini.cli',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ require => Package['php5-cli'],
+ }
}
file { "${php_module_conf_dir}/mail.ini":
--
To view, visit https://gerrit.wikimedia.org/r/294037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbea40da58622a8dcfa6db6e01f5a576a910d503
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
