summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-08-29 16:18:10 -0400
committerMicah Anderson <micah@leap.se>2013-08-29 16:18:10 -0400
commit40a4e7a9e939bbf5a8cd550dd6e64c029eb83273 (patch)
tree6609f4f9ce5769c4d5797a76afee1684281ddb5c /puppet/modules/site_webapp
parent1f66ee794114d6a7096e15d0b044c17cb6d22a91 (diff)
parent323ceff1ea60bd3463821fc2295ffb790d822165 (diff)
Merge branch 'bug/3612' into develop
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 }