projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Make it work with jessie, III"
[mirror/dsa-puppet.git]
/
modules
/
munin
/
manifests
/
init.pp
diff --git
a/modules/munin/manifests/init.pp
b/modules/munin/manifests/init.pp
index
8730f53
..
2522138
100644
(file)
--- a/
modules/munin/manifests/init.pp
+++ b/
modules/munin/manifests/init.pp
@@
-11,14
+11,12
@@
class munin {
$owner = $::lsbdistcodename ? {
squeeze => munin,
$owner = $::lsbdistcodename ? {
squeeze => munin,
- wheezy => root,
- undef => munin,
+ default => root,
}
$gid = $::lsbdistcodename ? {
squeeze => adm,
}
$gid = $::lsbdistcodename ? {
squeeze => adm,
- wheezy => 'www-data',
- undef => adm,
+ default => 'www-data',
}
file { '/var/log/munin':
}
file { '/var/log/munin':
@@
-40,6
+38,11
@@
class munin {
notify => Service['munin-node'],
}
notify => Service['munin-node'],
}
+ file { '/etc/logrotate.d/munin-node':
+ source => 'puppet:///modules/munin/logrotate',
+ require => Package['munin-node'],
+ }
+
file { [ '/etc/munin/plugins/df', '/etc/munin/plugins/df_abs', '/etc/munin/plugins/df_inode' ]:
source => 'puppet:///modules/munin/df-wrap',
mode => '0555',
file { [ '/etc/munin/plugins/df', '/etc/munin/plugins/df_abs', '/etc/munin/plugins/df_inode' ]:
source => 'puppet:///modules/munin/df-wrap',
mode => '0555',
@@
-76,7
+79,7
@@
class munin {
# ensure => 'absent',
# }
#}
# ensure => 'absent',
# }
#}
- if $::lsbmajdistrelease >= 7 {
+ if $::lsbmajdistrelease
== "testing" or $::lsbmajdistrelease
>= 7 {
package { 'munin-async':
ensure => installed
}
package { 'munin-async':
ensure => installed
}