Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/137921
Change subject: contint: reduce duplication with mediawiki::packages
......................................................................
contint: reduce duplication with mediawiki::packages
The contint::packages class has a lot of duplication with
mediawiki::packages and is installed on all hosts. Slightly unclutter
the former by using the later instead.
Tested in labs.
Change-Id: I09f760213e90e5802c7a1ac63341e8af9a31e2d0
---
M modules/contint/manifests/browsertests.pp
M modules/contint/manifests/packages.pp
2 files changed, 4 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/137921/1
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index 97579db..56356a6 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -33,10 +33,6 @@
ensure => absent
}
- class { '::mediawiki::packages':
- with_apc => false,
- }
-
# Set up all packages required for MediaWiki (includes Apache)
package { [
'chromium-browser',
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 4f8365a..3f1408e 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -7,6 +7,10 @@
include androidsdk::dependencies
+ class { '::mediawiki::packages':
+ with_apc => false,
+ }
+
# Get several OpenJDK packages including the jdk to build mobile
# applications.
# (openjdk is the default distribution for the java define.
@@ -29,13 +33,8 @@
# PHP related packages
package { [
- 'php-pear',
- 'php5-cli',
- 'php5-curl',
'php5-dev', # phpize
'php5-gd',
- 'php5-intl',
- 'php5-mysql',
'php5-parsekit',
'php5-pgsql',
'php5-sqlite',
@@ -43,14 +42,6 @@
'php5-xdebug',
]:
ensure => present,
- }
-
- # luasandbox is a WMF package, we always want to use the very latest
version
- # since the package is used by unit tests
- package { [
- 'php-luasandbox',
- ]:
- ensure => latest,
}
# Database related
@@ -64,9 +55,7 @@
# Development packages
package { [
- 'imagemagick',
'librsvg2-2',
- 'librsvg2-bin',
'asciidoc',
'rake',
@@ -155,12 +144,6 @@
ensure => present,
}
- # Uninstalled packages
- package { [
- 'php-apc',
- ]: ensure => absent,
- }
-
# Packages to support use of rspec on puppet modules:
package { [
# Packages imported from Debian Sid:
@@ -181,15 +164,4 @@
ensure => present;
}
- package { [
- 'djvulibre-bin',
- ]:
- ensure => present;
- }
-
- package { [
- 'ocaml-nox',
- ]:
- ensure => present;
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/137921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09f760213e90e5802c7a1ac63341e8af9a31e2d0
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
