diff options
| author | Christian G. Warden <cwarden@xerus.org> | 2012-02-02 18:19:33 -0800 |
|---|---|---|
| committer | Christian G. Warden <cwarden@xerus.org> | 2012-02-02 18:19:33 -0800 |
| commit | c91621a0953d97a83f62205519524708c279a24e (patch) | |
| tree | dc7f1709a4b23b2dc3cc02c8f0cd48eafdd31945 /manifests/host.pp | |
| parent | d8de9540534a3801c87278435934da3c88a69e4b (diff) | |
Fix munin.conf for squeeze and later Debian releases
Add support for lsbdistcodename-specific munin.conf.header files.
Create squeeze munin.conf.header file which contains the new htmldir
setting, /var/cache/munin/www, and symlink wheezy and sid to it.
Diffstat (limited to 'manifests/host.pp')
| -rw-r--r-- | manifests/host.pp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/manifests/host.pp b/manifests/host.pp index 107cd39..a26c013 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -9,10 +9,12 @@ class munin::host { concat::fragment{'munin.conf.header': target => '/etc/munin/munin.conf', - source => [ "puppet:///modules/site-munin/config/host/${fqdn}/munin.conf.header", - "puppet:///modules/site-munin/config/host/munin.conf.header.$operatingsystem", + source => [ "puppet:///modules/site-munin/config/host/${::fqdn}/munin.conf.header", + "puppet:///modules/site-munin/config/host/munin.conf.header.${::operatingsystem}.${::lsbdistcodename}", + "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.${::operatingsystem}.${::lsbdistcodename}", + "puppet:///modules/munin/config/host/munin.conf.header.${::operatingsystem}", "puppet:///modules/munin/config/host/munin.conf.header" ], order => 05, } |