Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345502 )
Change subject: Remove a number of obsolete conditionals from mediawiki classes
......................................................................
Remove a number of obsolete conditionals from mediawiki classes
No longer needed since precise is gone.
Change-Id: Iae49958f85b53643ee153b085e26653b60f12a9a
---
M modules/mediawiki/manifests/hhvm.pp
M modules/mediawiki/manifests/init.pp
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/manifests/packages/fonts.pp
M modules/mediawiki/manifests/packages/php5.pp
M modules/mediawiki/manifests/php.pp
M modules/mediawiki/manifests/php_enmod.pp
M modules/mediawiki/manifests/web.pp
M modules/mediawiki/manifests/web/mpm_config.pp
M modules/mediawiki/manifests/web/php_engine.pp
10 files changed, 0 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/345502/1
diff --git a/modules/mediawiki/manifests/hhvm.pp
b/modules/mediawiki/manifests/hhvm.pp
index 2dbdf83..8649f4c 100644
--- a/modules/mediawiki/manifests/hhvm.pp
+++ b/modules/mediawiki/manifests/hhvm.pp
@@ -3,7 +3,6 @@
# Configures HHVM to serve MediaWiki in FastCGI mode.
#
class mediawiki::hhvm {
- requires_os('ubuntu >= trusty || Debian >= jessie')
include ::hhvm::admin
include ::hhvm::monitoring
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index d4627ab..8b54677 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -20,9 +20,6 @@
$forward_syslog = undef,
) {
- # Simplicity over support: precise is going out of support in April 2017
anyways
- requires_os('ubuntu >= trusty || Debian >= jessie')
-
include ::mediawiki::cgroup
include ::mediawiki::packages
include ::mediawiki::scap
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index 5e34947..7af0842 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -17,7 +17,6 @@
$port = 9005,
) {
- requires_os('ubuntu >= trusty || Debian >= jessie')
include ::passwords::redis
package { 'jobrunner':
diff --git a/modules/mediawiki/manifests/packages/fonts.pp
b/modules/mediawiki/manifests/packages/fonts.pp
index dd8ce14..e72d63e 100644
--- a/modules/mediawiki/manifests/packages/fonts.pp
+++ b/modules/mediawiki/manifests/packages/fonts.pp
@@ -3,7 +3,6 @@
# Provisions font packages used by MediaWiki.
#
class mediawiki::packages::fonts {
- requires_os('ubuntu >= trusty || Debian >= jessie')
package { [
'fonts-arabeyes',
diff --git a/modules/mediawiki/manifests/packages/php5.pp
b/modules/mediawiki/manifests/packages/php5.pp
index c6203da..8e0e879 100644
--- a/modules/mediawiki/manifests/packages/php5.pp
+++ b/modules/mediawiki/manifests/packages/php5.pp
@@ -5,7 +5,6 @@
# configured for HHVM, but a few are still using PHP5 (T86081).
#
class mediawiki::packages::php5 {
- requires_os('ubuntu >= trusty || Debian >= jessie')
# We don't need php-apc on php > 5.3
package { 'php-apc':
diff --git a/modules/mediawiki/manifests/php.pp
b/modules/mediawiki/manifests/php.pp
index 6314a75..21428c5 100644
--- a/modules/mediawiki/manifests/php.pp
+++ b/modules/mediawiki/manifests/php.pp
@@ -4,7 +4,6 @@
#
class mediawiki::php {
include ::mediawiki::packages
- requires_os('ubuntu >= trusty || Debian >= jessie')
$php_module_conf_dir = '/etc/php5/mods-available'
mediawiki::php_enmod { ['mail']: }
diff --git a/modules/mediawiki/manifests/php_enmod.pp
b/modules/mediawiki/manifests/php_enmod.pp
index 00752c2..5d305c2 100644
--- a/modules/mediawiki/manifests/php_enmod.pp
+++ b/modules/mediawiki/manifests/php_enmod.pp
@@ -3,7 +3,6 @@
# Enables a php config file in newer ubuntu/debian hosts.
define mediawiki::php_enmod {
- requires_os('ubuntu >= trusty || debian >= jessie')
exec { "PHP module ${title} enable":
command => "/usr/sbin/php5enmod -s ALL ${title}",
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index cd933bd..fa13ca5 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -4,7 +4,6 @@
class mediawiki::web {
tag 'mediawiki', 'mw-apache-config'
- requires_os('ubuntu >= trusty || Debian >= jessie')
include ::apache
include ::mediawiki
include ::mediawiki::users
diff --git a/modules/mediawiki/manifests/web/mpm_config.pp
b/modules/mediawiki/manifests/web/mpm_config.pp
index 5879f22..f8d19e0 100644
--- a/modules/mediawiki/manifests/web/mpm_config.pp
+++ b/modules/mediawiki/manifests/web/mpm_config.pp
@@ -14,7 +14,6 @@
}
'worker': {
# this can only be used on hhvm servers
- requires_os('ubuntu >= trusty || debian >= jessie')
$threads_per_child = 25
$apache_server_limit = $::processorcount
diff --git a/modules/mediawiki/manifests/web/php_engine.pp
b/modules/mediawiki/manifests/web/php_engine.pp
index 2ca276e..ae8d7df 100644
--- a/modules/mediawiki/manifests/web/php_engine.pp
+++ b/modules/mediawiki/manifests/web/php_engine.pp
@@ -1,7 +1,6 @@
# === Class mediawiki::web::php_engine
# Configures apache to serve requests via HHVM/any other FastCGI backend
class mediawiki::web::php_engine {
- requires_os('ubuntu >= trusty || Debian >= jessie')
include ::apache::mod::proxy_fcgi
apache::mod_conf { 'mod_php5':
--
To view, visit https://gerrit.wikimedia.org/r/345502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae49958f85b53643ee153b085e26653b60f12a9a
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
