From dab730ed6b0667d4356c0e8e21e37719ea977a93 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 15 Jul 2010 20:41:39 +0200 Subject: fixing weird class setup we had some weird class setup which caused some problems on 2.6 (see puppet bug #4242 for more info). This commit cleans that weird setup up and decouples a lot of things. --- manifests/plugins/setup.pp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 manifests/plugins/setup.pp (limited to 'manifests/plugins/setup.pp') diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp new file mode 100644 index 0000000..f645f12 --- /dev/null +++ b/manifests/plugins/setup.pp @@ -0,0 +1,27 @@ +class munin::plugins::setup { + file { + [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]: + source => "puppet://$server/modules/common/empty", + ignore => [ '\.ignore', 'snmp_*' ], + ensure => directory, checksum => mtime, + recurse => true, purge => true, force => true, + mode => 0755, owner => root, group => 0, + notify => Service['munin-node']; + '/etc/munin/plugin-conf.d/munin-node': + ensure => present, + mode => 0644, owner => root, group => 0, + notify => Service['munin-node'], + } + case $kernel { + openbsd: { + File['/etc/munin/plugin-conf.d/munin-node']{ + before => File['/var/run/munin'], + } + } + default: { + File['/etc/munin/plugin-conf.d/munin-node']{ + before => Package['munin-node'], + } + } + } +} -- cgit v1.2.3 From b491a012b6c2af328a782d27d8109aa282611f0c Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 20 Jul 2010 00:32:09 +0200 Subject: remove escaping --- manifests/plugins/setup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/plugins/setup.pp') diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp index f645f12..e0d445c 100644 --- a/manifests/plugins/setup.pp +++ b/manifests/plugins/setup.pp @@ -2,7 +2,7 @@ class munin::plugins::setup { file { [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]: source => "puppet://$server/modules/common/empty", - ignore => [ '\.ignore', 'snmp_*' ], + ignore => [ '.ignore', 'snmp_*' ], ensure => directory, checksum => mtime, recurse => true, purge => true, force => true, mode => 0755, owner => root, group => 0, -- cgit v1.2.3 From fc9a763859a4817a6f7ae06b3b3298e8325ff351 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 21 Jul 2010 07:53:05 +0200 Subject: Revert "remove escaping" This reverts commit b491a012b6c2af328a782d27d8109aa282611f0c. --- manifests/plugins/setup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/plugins/setup.pp') diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp index e0d445c..f645f12 100644 --- a/manifests/plugins/setup.pp +++ b/manifests/plugins/setup.pp @@ -2,7 +2,7 @@ class munin::plugins::setup { file { [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]: source => "puppet://$server/modules/common/empty", - ignore => [ '.ignore', 'snmp_*' ], + ignore => [ '\.ignore', 'snmp_*' ], ensure => directory, checksum => mtime, recurse => true, purge => true, force => true, mode => 0755, owner => root, group => 0, -- cgit v1.2.3 From dbcbf2607d52e922c20d0491400ab3099d0dba2a Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 2 Aug 2010 01:54:15 +0200 Subject: escaping --- manifests/plugins/setup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/plugins/setup.pp') diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp index f645f12..e0d445c 100644 --- a/manifests/plugins/setup.pp +++ b/manifests/plugins/setup.pp @@ -2,7 +2,7 @@ class munin::plugins::setup { file { [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]: source => "puppet://$server/modules/common/empty", - ignore => [ '\.ignore', 'snmp_*' ], + ignore => [ '.ignore', 'snmp_*' ], ensure => directory, checksum => mtime, recurse => true, purge => true, force => true, mode => 0755, owner => root, 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/plugins/setup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/plugins/setup.pp') diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp index e0d445c..c2c5ed3 100644 --- a/manifests/plugins/setup.pp +++ b/manifests/plugins/setup.pp @@ -1,7 +1,7 @@ class munin::plugins::setup { file { [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]: - source => "puppet://$server/modules/common/empty", + source => "puppet:///modules/common/empty", ignore => [ '.ignore', 'snmp_*' ], ensure => directory, checksum => mtime, recurse => true, purge => true, force => true, -- cgit v1.2.3