Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149066
Change subject: apache: cherry-pick mods added in Ia46312071
......................................................................
apache: cherry-pick mods added in Ia46312071
* Make Ia46312071 smaller and safer by introducing the mods it depends on.
* Make MPM changes do a config test.
Change-Id: If903d5cb39f561203271a87fe192533fb7fd299d
---
M modules/apache/manifests/mod.pp
M modules/apache/manifests/mpm.pp
2 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/149066/1
diff --git a/modules/apache/manifests/mod.pp b/modules/apache/manifests/mod.pp
index 819ec34..1f23bb8 100644
--- a/modules/apache/manifests/mod.pp
+++ b/modules/apache/manifests/mod.pp
@@ -4,7 +4,7 @@
# Apache mods. Because the classes are not parametrized, they may be
# included multiple times without causing duplicate definition errors.
#
-class apache::mod {} # Stub to work around Puppet 2.x parser bug.
+class apache::mod {}
# Modules that are bundled with the apache2 package
class apache::mod::actions { apache::mod_conf { 'actions': } }
@@ -12,7 +12,9 @@
class apache::mod::auth_basic { apache::mod_conf { 'auth_basic': } }
class apache::mod::authn_file { apache::mod_conf { 'authn_file': } }
class apache::mod::authnz_ldap { apache::mod_conf { 'authnz_ldap': } }
+class apache::mod::authz_host { apache::mod_conf { 'authz_host': } }
class apache::mod::authz_user { apache::mod_conf { 'authz_user': } }
+class apache::mod::autoindex { apache::mod_conf { 'autoindex': } }
class apache::mod::cgi { apache::mod_conf { 'cgi': } }
class apache::mod::dav { apache::mod_conf { 'dav': } }
class apache::mod::dav_fs { apache::mod_conf { 'dav_fs': } }
@@ -24,10 +26,10 @@
class apache::mod::proxy_balancer { apache::mod_conf { 'proxy_balancer': } }
class apache::mod::proxy_http { apache::mod_conf { 'proxy_http': } }
class apache::mod::rewrite { apache::mod_conf { 'rewrite': } }
+class apache::mod::setenvif { apache::mod_conf { 'setenvif': } }
class apache::mod::ssl { apache::mod_conf { 'ssl': } }
-class apache::mod::userdir { apache::mod_conf { 'userdir': } }
class apache::mod::status { apache::mod_conf { 'status': } }
-
+class apache::mod::userdir { apache::mod_conf { 'userdir': } }
# Modules that depend on additional packages
class apache::mod::authz_svn { apache::mod_conf { 'authz_svn': } <-
package { 'libapache2-svn': } }
@@ -42,6 +44,6 @@
class apache::mod::wsgi { apache::mod_conf { 'wsgi': } <-
package { 'libapache2-mod-wsgi': } }
# Modules that target a specific distribution
-class apache::mod::proxy_fcgi { if versioncmp($::lsbdistrelease, '13.10')
>= 0 { apache::mod_conf { 'proxy_fcgi': } } } # 2.3+
-class apache::mod::access_compat { if versioncmp($::lsbdistrelease, '13.10')
>= 0 { apache::mod_conf { 'access_compat': } } } # Not relevant
-class apache::mod::version { if versioncmp($::lsbdistrelease, '13.10')
< 0 { apache::mod_conf { 'version': } } } # Baked-in
+class apache::mod::access_compat { if ubuntu_version('>= 13.10') {
apache::mod_conf { 'access_compat': } } }
+class apache::mod::proxy_fcgi { if ubuntu_version('>= 13.10') {
apache::mod_conf { 'proxy_fcgi': } } }
+class apache::mod::version { if ubuntu_version( '< 13.10') {
apache::mod_conf { 'version': } } }
diff --git a/modules/apache/manifests/mpm.pp b/modules/apache/manifests/mpm.pp
index 093d0eb..b4f64e5 100644
--- a/modules/apache/manifests/mpm.pp
+++ b/modules/apache/manifests/mpm.pp
@@ -65,5 +65,6 @@
apache::mod_conf { $selected_mod:
ensure => present,
+ notify => Exec['apache2_test_config'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/149066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If903d5cb39f561203271a87fe192533fb7fd299d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
