diff options
| author | Micah Anderson <micah@leap.se> | 2013-08-29 16:18:10 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-08-29 16:18:10 -0400 |
| commit | 40a4e7a9e939bbf5a8cd550dd6e64c029eb83273 (patch) | |
| tree | 6609f4f9ce5769c4d5797a76afee1684281ddb5c /puppet | |
| parent | 1f66ee794114d6a7096e15d0b044c17cb6d22a91 (diff) | |
| parent | 323ceff1ea60bd3463821fc2295ffb790d822165 (diff) | |
Merge branch 'bug/3612' into develop
Diffstat (limited to 'puppet')
5 files changed, 19 insertions, 8 deletions
diff --git a/puppet/modules/site_apache/manifests/module/alias.pp b/puppet/modules/site_apache/manifests/module/alias.pp new file mode 100644 index 00000000..c1f5e185 --- /dev/null +++ b/puppet/modules/site_apache/manifests/module/alias.pp @@ -0,0 +1,5 @@ +class site_apache::module::alias ( $ensure = present ) +{ + + apache::module { 'alias': ensure => $ensure } +} diff --git a/puppet/modules/site_apache/manifests/module/headers.pp b/puppet/modules/site_apache/manifests/module/headers.pp new file mode 100644 index 00000000..f7caa28c --- /dev/null +++ b/puppet/modules/site_apache/manifests/module/headers.pp @@ -0,0 +1,5 @@ +class site_apache::module::headers ( $ensure = present ) +{ + + apache::module {'headers': ensure => $ensure } +} diff --git a/puppet/modules/site_apache/manifests/module/rewrite.pp b/puppet/modules/site_apache/manifests/module/rewrite.pp new file mode 100644 index 00000000..7ad00a0c --- /dev/null +++ b/puppet/modules/site_apache/manifests/module/rewrite.pp @@ -0,0 +1,5 @@ +class site_apache::module::rewrite ( $ensure = present ) +{ + + apache::module { 'rewrite': ensure => $ensure } +} diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index 5ca04da2..a088921a 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -18,9 +18,7 @@ class site_nagios::server inherits nagios::base { #before => Class ['nagios::defaults'] } - apache::module { - 'headers': ensure => present; - } + include site_apache::module::headers File ['nagios_htpasswd'] { source => undef, 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 } |