projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix munin 1
[mirror/dsa-puppet.git]
/
modules
/
munin
/
manifests
/
init.pp
diff --git
a/modules/munin/manifests/init.pp
b/modules/munin/manifests/init.pp
index
c9b9853
..
b4a5398
100644
(file)
--- a/
modules/munin/manifests/init.pp
+++ b/
modules/munin/manifests/init.pp
@@
-9,22
+9,10
@@
class munin {
require => Package['munin-node'],
}
require => Package['munin-node'],
}
- $owner = $::lsbdistcodename ? {
- squeeze => munin,
- wheezy => root,
- undef => munin,
- }
-
- $gid = $::lsbdistcodename ? {
- squeeze => adm,
- wheezy => 'www-data',
- undef => adm,
- }
-
file { '/var/log/munin':
ensure => directory,
file { '/var/log/munin':
ensure => directory,
- owner =>
$owner
,
- group =>
$gid
,
+ owner =>
root
,
+ group =>
'www-data'
,
mode => '0755',
}
mode => '0755',
}
@@
-45,13
+33,28
@@
class munin {
require => Package['munin-node'],
}
require => Package['munin-node'],
}
- file { [ '/etc/munin/plugins/df', '/etc/munin/plugins/df_abs', '/etc/munin/plugins/df_inode' ]:
+ file { '/etc/munin/plugins/df':
+ ensure => link,
+ target => '/usr/share/munin/plugins/df',
+ require => Package['munin-node'],
+ notify => Service['munin-node'],
+ }
+
+ file { '/etc/munin/plugins/df_abs':
+ ensure => file,
source => 'puppet:///modules/munin/df-wrap',
mode => '0555',
require => Package['munin-node'],
notify => Service['munin-node'],
}
source => 'puppet:///modules/munin/df-wrap',
mode => '0555',
require => Package['munin-node'],
notify => Service['munin-node'],
}
+ file { '/etc/munin/plugins/df_inode':
+ ensure => link,
+ target => '/usr/share/munin/plugins/df_inode',
+ require => Package['munin-node'],
+ notify => Service['munin-node'],
+ }
+
@ferm::rule { 'dsa-munin-v4':
description => 'Allow munin from munin master',
rule => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr ($HOST_MUNIN_V4 $HOST_NAGIOS_V4) ACCEPT; }',
@ferm::rule { 'dsa-munin-v4':
description => 'Allow munin from munin master',
rule => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr ($HOST_MUNIN_V4 $HOST_NAGIOS_V4) ACCEPT; }',
@@
-65,11
+68,9
@@
class munin {
notarule => true,
}
notarule => true,
}
- @@munin::master-per-node {
- $::fqdn:
+ @@munin::master_per_node { $::fqdn:
ipaddress => $::ipaddress,
munin_async => $::munin_async,
ipaddress => $::ipaddress,
munin_async => $::munin_async,
- ;
}
#if $::munin_async and str2bool($::munin_async) == true {
}
#if $::munin_async and str2bool($::munin_async) == true {
@@
-81,12
+82,10
@@
class munin {
# ensure => 'absent',
# }
#}
# ensure => 'absent',
# }
#}
- if $::lsbmajdistrelease >= 7 {
- package { 'munin-async':
- ensure => installed
- }
- file { '/etc/ssh/userkeys/munin-async':
- source => 'puppet:///modules/munin/munin-async-authkeys',
- }
+ package { 'munin-async':
+ ensure => installed
+ }
+ file { '/etc/ssh/userkeys/munin-async':
+ source => 'puppet:///modules/munin/munin-async-authkeys',
}
}
}
}