summaryrefslogtreecommitdiff
path: root/manifests/apache.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/apache.pp')
-rw-r--r--manifests/apache.pp21
1 files changed, 2 insertions, 19 deletions
diff --git a/manifests/apache.pp b/manifests/apache.pp
index 8fa9061..87fe3d2 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -3,30 +3,13 @@ class nagios::apache(
$allow_external_cmd = false,
$manage_shorewall = false,
$manage_munin = false,
- $stored_config = true
+ $storeconfigs = true
) {
class{'::nagios':
httpd => 'apache',
allow_external_cmd => $allow_external_cmd,
manage_munin => $manage_munin,
manage_shorewall => $manage_shorewall,
- stored_config => $stored_config
- }
-
- case $::operatingsystem {
- 'debian': {
- file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf":
- ensure => present,
- source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/apache2.conf",
- "puppet:///modules/site_nagios/configs/apache2.conf",
- "puppet:///modules/nagios/configs/apache2.conf"],
- }
-
- apache::config::global { "nagios3.conf":
- ensure => link,
- target => "${nagios::defaults::vars::int_cfgdir}/apache2.conf",
- require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"],
- }
- }
+ storeconfigs => $storeconfigs
}
}