summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-12-22 20:51:18 -0500
committerMicah Anderson <micah@riseup.net>2009-12-22 20:51:18 -0500
commit3594e9a5ab49ae2a60915c788d3ca3b0e979078b (patch)
tree8f65d41af5aaf2e500afa22cf48d53dace7c5608 /manifests
parent5abd8f38402f08a3cbb544681ca47ff44e4253e6 (diff)
fix formatting to be standard
Diffstat (limited to 'manifests')
-rw-r--r--manifests/host.pp68
1 files changed, 34 insertions, 34 deletions
diff --git a/manifests/host.pp b/manifests/host.pp
index fd70710..c1fa3db 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -4,43 +4,43 @@
class munin::host inherits munin
{
- package {"munin": ensure => installed, }
-
- File <<| tag == 'munin' |>>
-
- file{'/etc/munin/munin.conf.header':
- source => [ "puppet://$server/modules/site-munin/config/host/${fqdn}/munin.conf.header",
- "puppet://$server/modules/site-munin/config/host/munin.conf.header.$operatingsystem",
- "puppet://$server/modules/site-munin/config/host/munin.conf.header",
- "puppet://$server/modules/munin/config/host/munin.conf.header.$operatingsystem",
- "puppet://$server/modules/munin/config/host/munin.conf.header" ],
- notify => Exec['concat_/etc/munin/munin.conf'],
+ package {"munin": ensure => installed, }
+
+ File <<| tag == 'munin' |>>
+
+ file{'/etc/munin/munin.conf.header':
+ source => [ "puppet://$server/modules/site-munin/config/host/${fqdn}/munin.conf.header",
+ "puppet://$server/modules/site-munin/config/host/munin.conf.header.$operatingsystem",
+ "puppet://$server/modules/site-munin/config/host/munin.conf.header",
+ "puppet://$server/modules/munin/config/host/munin.conf.header.$operatingsystem",
+ "puppet://$server/modules/munin/config/host/munin.conf.header" ],
+ notify => Exec['concat_/etc/munin/munin.conf'],
+ owner => root, group => 0, mode => 0644;
+ }
+
+ concatenated_file { "/etc/munin/munin.conf":
+ dir => '/var/lib/puppet/modules/munin/nodes',
+ header => "/etc/munin/munin.conf.header",
+ }
+
+ file { ["/var/log/munin-update.log", "/var/log/munin-limits.log",
+ "/var/log/munin-graph.log", "/var/log/munin-html.log"]:
+ ensure => present,
+ mode => 640, owner => munin, group => 0;
+ }
+
+ include munin::plugins::muninhost
+
+ case $operatingsystem {
+ centos: {
+ include munin::host::cgi
+ # from time to time we cleanup hanging munin-runs
+ file{'/etc/cron.d/munin_kill':
+ content => "4,34 * * * * root if $(ps ax | grep -v grep | grep -q munin-run); then killall munin-run; fi\n",
owner => root, group => 0, mode => 0644;
- }
-
- concatenated_file { "/etc/munin/munin.conf":
- dir => '/var/lib/puppet/modules/munin/nodes',
- header => "/etc/munin/munin.conf.header",
- }
-
- file { ["/var/log/munin-update.log", "/var/log/munin-limits.log",
- "/var/log/munin-graph.log", "/var/log/munin-html.log"]:
- ensure => present,
- mode => 640, owner => munin, group => 0;
- }
-
- include munin::plugins::muninhost
-
- case $operatingsystem {
- centos: {
- include munin::host::cgi
- # from time to time we cleanup hanging munin-runs
- file{'/etc/cron.d/munin_kill':
- content => "4,34 * * * * root if $(ps ax | grep -v grep | grep -q munin-run); then killall munin-run; fi\n",
- owner => root, group => 0, mode => 0644;
- }
}
}
+ }
if $use_shorewall {
include shorewall::rules::out::munin
}