MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177431
Change subject: Remove igbinary everywhere
......................................................................
Remove igbinary everywhere
Not supposed to be used, but is still present, causing cache entries
that HHVM can't understand.
Change-Id: I3828352052aced469ea783b43ee87fe5ff67ea00
---
D modules/mediawiki/files/php/igbinary.ini
M modules/mediawiki/manifests/packages/php5.pp
M modules/mediawiki/manifests/php.pp
3 files changed, 9 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/177431/1
diff --git a/modules/mediawiki/files/php/igbinary.ini
b/modules/mediawiki/files/php/igbinary.ini
deleted file mode 100644
index dbcf29d..0000000
--- a/modules/mediawiki/files/php/igbinary.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; configuration for php igbinary module
-extension=igbinary.so
-
-; Enable or disable compacting of duplicate strings
-; The default is On.
-igbinary.compact_strings=Off
-
diff --git a/modules/mediawiki/manifests/packages/php5.pp
b/modules/mediawiki/manifests/packages/php5.pp
index 700fdf1..ec8c198 100644
--- a/modules/mediawiki/manifests/packages/php5.pp
+++ b/modules/mediawiki/manifests/packages/php5.pp
@@ -41,10 +41,14 @@
if ubuntu_version('precise') {
package { [
'libmemcached11', # Formerly a dependency for php5-memcached
- 'php5-igbinary', # No longer in use
'php5-wmerrors', # Not packaged for Trusty
]:
ensure => present,
}
}
+
+ # No longer in use
+ package { 'php5-igbinary':
+ ensure => absent,
+ }
}
diff --git a/modules/mediawiki/manifests/php.pp
b/modules/mediawiki/manifests/php.pp
index 38ba8b8..b52040a 100644
--- a/modules/mediawiki/manifests/php.pp
+++ b/modules/mediawiki/manifests/php.pp
@@ -42,15 +42,11 @@
require => Package['php-mail'],
}
- if ubuntu_version('precise') {
- file { '/etc/php5/conf.d/igbinary.ini':
- source => 'puppet:///modules/mediawiki/php/igbinary.ini',
- owner => 'root',
- group => 'root',
- mode => '0444',
- require => Package['php5-igbinary'],
- }
+ file { '/etc/php5/conf.d/igbinary.ini':
+ ensure => absent,
+ }
+ if ubuntu_version('precise') {
file { '/etc/php5/conf.d/wmerrors.ini':
content => template('mediawiki/php/wmerrors.ini.erb'),
owner => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/177431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3828352052aced469ea783b43ee87fe5ff67ea00
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
