Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345505 )
Change subject: Remove obsolete mediawiki::packages::legacy class
......................................................................
Remove obsolete mediawiki::packages::legacy class
No longer needed since precise is gone.
Change-Id: I0fdc16269e7c10cfe6424dd5e19f7b1c95ad2db1
---
M modules/mediawiki/manifests/packages.pp
D modules/mediawiki/manifests/packages/legacy.pp
2 files changed, 1 insertion(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/345505/1
diff --git a/modules/mediawiki/manifests/packages.pp
b/modules/mediawiki/manifests/packages.pp
index 8e84957..f35eea6 100644
--- a/modules/mediawiki/manifests/packages.pp
+++ b/modules/mediawiki/manifests/packages.pp
@@ -2,10 +2,7 @@
#
# Packages needed for mediawiki
class mediawiki::packages {
- # Precise is still used on CI slaves for PHP 5.3 tests
- if os_version('ubuntu < trusty') {
- include ::mediawiki::packages::legacy
- } elsif os_version('ubuntu == trusty') {
+ if os_version('ubuntu == trusty') {
include ::mediawiki::packages::php5
}
diff --git a/modules/mediawiki/manifests/packages/legacy.pp
b/modules/mediawiki/manifests/packages/legacy.pp
deleted file mode 100644
index 4a51ec6..0000000
--- a/modules/mediawiki/manifests/packages/legacy.pp
+++ /dev/null
@@ -1,39 +0,0 @@
-# === Class mediawiki::packages::legacy
-#
-# This class declares packages that are used on legacy versions of ubuntu
-class mediawiki::packages::legacy {
- requires_os('ubuntu < trusty')
-
- # Run-time
- package { [
- 'php5-cli',
- 'php5-common',
- 'php5-dbg',
- ]:
- ensure => present,
- }
-
- # Wikimedia PHP extensions
- package { [
- 'php-luasandbox',
- 'php-wikidiff2',
- ]:
- ensure => present,
- }
-
- # Third-party PHP extensions
- package { [
- 'php-apc',
- 'php5-curl',
- 'php5-geoip',
- 'php5-igbinary',
- 'php5-intl',
- 'php5-memcached',
- 'php5-mysql',
- 'php5-redis',
- 'php5-xmlrpc',
- 'php5-wmerrors',
- ]:
- ensure => present,
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/345505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fdc16269e7c10cfe6424dd5e19f7b1c95ad2db1
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
