Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/143532
Change subject: apache: improve docs; provision apache::def before
apache::{mod_conf,conf}
......................................................................
apache: improve docs; provision apache::def before apache::{mod_conf,conf}
Change-Id: I25ed305caf1fd2576531a9d283602de483699b2f
---
M modules/apache/manifests/init.pp
1 file changed, 20 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/143532/1
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index 749093c..a37f22d 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -2,11 +2,25 @@
#
# Provisions Apache web server package and service.
#
+# This module was designed to provide a consistent interface over a
+# mixed production environment which includes both Precise / Apache 2.2
+# hosts and Trusty / Apache 2.4 hosts, and which utilizes Apache for
+# both mission-critical services (serving MediaWiki) and small, and
+# internal services.
+#
+# It accomodates different use-cases by expecting the caller to pass in
+# full configuration files, rather than generating configuration files
+# based on complex parameters and switches.
+#
+# The module provides forward- and back-compatibility by enabling
+# mod_version, mod_filter and mod_access_compat by default, and by using
+# /etc/apache2/conf-{enabled,available} to manage configuration snippets
+# on both Precise and Trusty.
+#
class apache {
- # Strive for seamless Apache 2.2 / 2.4 compatibility
- include apache::mod::access_compat
- include apache::mod::filter
- include apache::mod::version
+ include apache::mod::access_compat # enables allow/deny syntax in 2.4
+ include apache::mod::filter # enables AddOutputFilterByType in 2.4
+ include apache::mod::version # enables <IfVersion> config guards
package { [ 'apache2', 'apache2-mpm-prefork' ]:
ensure => present,
@@ -52,6 +66,6 @@
priority => 0,
}
- # Provision Apache modules before provisioning sites and config snippets
- Apache::Mod_conf <| |> -> Apache::Conf <| |>
+ # Set up runtime parameters and modules before sites and config snippets.
+ Apache::Def <| |> -> Apache::Mod_conf <| |> -> Apache::Conf <| |>
}
--
To view, visit https://gerrit.wikimedia.org/r/143532
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25ed305caf1fd2576531a9d283602de483699b2f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
