projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep postgresql-client-9.6 on backuphost
[mirror/dsa-puppet.git]
/
modules
/
munin
/
manifests
/
master.pp
diff --git
a/modules/munin/manifests/master.pp
b/modules/munin/manifests/master.pp
index
ca221b8
..
493b987
100644
(file)
--- a/
modules/munin/manifests/master.pp
+++ b/
modules/munin/manifests/master.pp
@@
-10,7
+10,8
@@
class munin::master {
}
ssl::service { 'munin.debian.org':
}
ssl::service { 'munin.debian.org':
- notify => Service['apache2'],
+ notify => Exec['service apache2 reload'],
+ key => true,
}
file { '/etc/munin/munin-conf.d':
ensure => directory,
}
file { '/etc/munin/munin-conf.d':
ensure => directory,
@@
-21,9
+22,12
@@
class munin::master {
source => 'puppet:///files/empty/',
}
source => 'puppet:///files/empty/',
}
- Munin::Master
-per-
node<<| |>>
+ Munin::Master
_per_
node<<| |>>
- file { '/etc/cron.d/puppet-munin-cleanup':
+ file { '/etc/cron.d/puppet-munin-cleanup': ensure => absent; }
+
+ concat::fragment { 'dsa-puppet-stuff--munin-master':
+ target => '/etc/cron.d/dsa-puppet-stuff',
source => 'puppet:///modules/munin/master-cleanup-cron',
}
}
source => 'puppet:///modules/munin/master-cleanup-cron',
}
}