From 36c07aa6cb615aad0cc5dd7d163221383d7ff9bb Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 2 Nov 2009 00:57:23 +0100 Subject: recursivly updating file path to new 0.25 style --- manifests/host.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/host.pp') diff --git a/manifests/host.pp b/manifests/host.pp index 9251516..bbfd0db 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -12,8 +12,8 @@ class munin::host source => [ "puppet://$server/files/munin/config/host/${fqdn}/munin.conf.header", "puppet://$server/files/munin/config/host/munin.conf.header.$operatingsystem", "puppet://$server/files/munin/config/host/munin.conf.header", - "puppet://$server/munin/config/host/munin.conf.header.$operatingsystem", - "puppet://$server/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; } -- cgit v1.2.3 From 53f373c61b0452488cdfb1d2779364e7865011ca Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 14 Nov 2009 13:15:30 +0100 Subject: update file paths to 0.25.x style --- manifests/host.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/host.pp') diff --git a/manifests/host.pp b/manifests/host.pp index bbfd0db..af78570 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -9,9 +9,9 @@ class munin::host File <<| tag == 'munin' |>> file{'/etc/munin/munin.conf.header': - source => [ "puppet://$server/files/munin/config/host/${fqdn}/munin.conf.header", - "puppet://$server/files/munin/config/host/munin.conf.header.$operatingsystem", - "puppet://$server/files/munin/config/host/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'], -- cgit v1.2.3 From ab0c496979e18b6a2ef1a550e2385766c76f765e Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Thu, 10 Dec 2009 16:08:30 -0500 Subject: adapt module_dir to new common module and create 'munin' base class to provide it, instead of doing an import --- manifests/host.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/host.pp') diff --git a/manifests/host.pp b/manifests/host.pp index af78570..9fd637d 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -2,7 +2,7 @@ # Copyright (C) 2007 David Schmitt # See LICENSE for the full license granted to you. -class munin::host +class munin::host inherits munin { package {"munin": ensure => installed, } -- cgit v1.2.3 From 4591a91f7a8b169d0aa3ccb46357c60f8dcb7079 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Thu, 13 May 2010 14:12:07 -0400 Subject: remove tabs and trailing whitespaces in manifests --- manifests/host.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'manifests/host.pp') diff --git a/manifests/host.pp b/manifests/host.pp index 9fd637d..87d3255 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -4,9 +4,9 @@ class munin::host inherits munin { - package {"munin": ensure => installed, } + package {"munin": ensure => installed, } - File <<| tag == 'munin' |>> + File <<| tag == 'munin' |>> file{'/etc/munin/munin.conf.header': source => [ "puppet://$server/modules/site-munin/config/host/${fqdn}/munin.conf.header", @@ -18,12 +18,12 @@ class munin::host inherits munin 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", + 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; -- cgit v1.2.3 From 3ccc8e2495a66ae9681bef64a4034a0e7828bf14 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 7 Aug 2010 02:12:20 +0200 Subject: remove unnecessary fileserver variable (#2460) --- manifests/host.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'manifests/host.pp') diff --git a/manifests/host.pp b/manifests/host.pp index 87d3255..e038fd7 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -9,11 +9,11 @@ class munin::host inherits munin 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" ], + source => [ "puppet:///modules/site-munin/config/host/${fqdn}/munin.conf.header", + "puppet:///modules/site-munin/config/host/munin.conf.header.$operatingsystem", + "puppet:///modules/site-munin/config/host/munin.conf.header", + "puppet:///modules/munin/config/host/munin.conf.header.$operatingsystem", + "puppet:///modules/munin/config/host/munin.conf.header" ], notify => Exec['concat_/etc/munin/munin.conf'], owner => root, group => 0, mode => 0644; } -- cgit v1.2.3 From 7a13b36953cc4e359a37c0e7fa80a6ee3b452766 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 31 May 2011 19:30:04 +0200 Subject: no need to manage logfiles, this should be done by the package --- manifests/host.pp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'manifests/host.pp') diff --git a/manifests/host.pp b/manifests/host.pp index e038fd7..69cc7da 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -23,12 +23,6 @@ class munin::host inherits munin 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 { -- cgit v1.2.3 From c88a6c4879e13b95e4fff00ec956557dd5be5689 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 31 May 2011 19:39:20 +0200 Subject: make cgi graphing optional --- manifests/host.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/host.pp') diff --git a/manifests/host.pp b/manifests/host.pp index 69cc7da..3e4f5ea 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -25,8 +25,8 @@ class munin::host inherits munin include munin::plugins::muninhost - case $operatingsystem { - centos: { include munin::host::cgi } + if $munin_do_cgi_graphing { + include munin::host::cgi } # from time to time we cleanup hanging munin-runs -- cgit v1.2.3