[MediaWiki-commits] [Gerrit] mediawiki::packages learned to disable php-apc - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/137910

Change subject: mediawiki::packages learned to disable php-apc
......................................................................

mediawiki::packages learned to disable php-apc

On place where code change very often (ie contint server) APC turns out
to be confused and failling to load code.  We remove php-apc entirely on
the host (commit 00ca778140).

Change-Id: I35dca3ceab88ab4981cfb82297079aca85cf6ddf
---
M modules/contint/manifests/browsertests.pp
M modules/mediawiki/manifests/packages.pp
2 files changed, 24 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/137910/1

diff --git a/modules/contint/manifests/browsertests.pp 
b/modules/contint/manifests/browsertests.pp
index 901b5cc..97579db 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -33,7 +33,9 @@
         ensure => absent
     }
 
-    include ::mediawiki::packages
+    class { '::mediawiki::packages':
+        with_apc => false,
+    }
 
     # Set up all packages required for MediaWiki (includes Apache)
     package { [
diff --git a/modules/mediawiki/manifests/packages.pp 
b/modules/mediawiki/manifests/packages.pp
index 446e9e9..5de0f6d 100644
--- a/modules/mediawiki/manifests/packages.pp
+++ b/modules/mediawiki/manifests/packages.pp
@@ -1,4 +1,14 @@
-class mediawiki::packages {
+# == Class mediawiki::packages
+#
+# Install Ubuntu packages required by MediaWiki
+#
+# == Parameters:
+#
+# $with_apc whether to install php-apc package. (Default: true)
+#
+class mediawiki::packages (
+    $with_apc = true,
+) {
     package { [
         'apache2-mpm-prefork',
         'imagemagick',
@@ -6,7 +16,6 @@
         'libapache2-mod-php5',
         'libmemcached10',       # XXX still needed?
         'libmemcached11',
-        'php-apc',
         'php-pear',
         'php5-cli',
         'php5-common',
@@ -14,6 +23,16 @@
         ensure => present,
     }
 
+    if( $with_apc ) {
+        package { 'php-apc':
+            ensure => present,
+        }
+    } else {
+        package { 'php-apc':
+            ensure => absent,
+        }
+    }
+
     # Standard PHP extensions
     package { [
         'php5-curl',

-- 
To view, visit https://gerrit.wikimedia.org/r/137910
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35dca3ceab88ab4981cfb82297079aca85cf6ddf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits