summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-08-29 15:05:15 -0400
committerMicah Anderson <micah@leap.se>2013-08-29 15:37:11 -0400
commit323ceff1ea60bd3463821fc2295ffb790d822165 (patch)
treeec8b08460b0b9103efd51bfce7b8721d1e9e0228 /puppet/modules/site_webapp
parentb093daf38d1bf33170382349ae8326e800ed70cd (diff)
create individual classes for the apache modules so they can be included more than once in different locations, depending on what services are configured on a node (#3612)
Change-Id: Iff064d3d67baa132fb5198fea741522ab4e71770
Diffstat (limited to 'puppet/modules/site_webapp')
-rw-r--r--puppet/modules/site_webapp/manifests/apache.pp8
1 files changed, 3 insertions, 5 deletions
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp
index 8b340160..4331afe4 100644
--- a/puppet/modules/site_webapp/manifests/apache.pp
+++ b/puppet/modules/site_webapp/manifests/apache.pp
@@ -14,11 +14,9 @@ class site_webapp::apache {
class { '::apache': no_default_site => true, ssl => true }
- apache::module {
- 'alias': ensure => present;
- 'rewrite': ensure => present;
- 'headers': ensure => present;
- }
+ include site_apache::module::headers
+ include site_apache::module::rewrite
+ include site_apache::module::alias
class { 'passenger': use_munin => false }