diff options
| author | mh <mh@immerda.ch> | 2012-04-10 14:58:55 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-04-10 14:59:45 +0200 |
| commit | aca8aa110225f13b35bb40f7ad153b5a0167bf58 (patch) | |
| tree | f9c1e8e7f104ec2082ad39966fe1143017693e57 /manifests | |
| parent | f06092dda9280b373f7a55dd11b650c729059151 (diff) | |
| parent | c91621a0953d97a83f62205519524708c279a24e (diff) | |
Merge remote-tracking branch 'cwarden/debian-squeeze-htmldir-fix' into master
Pull Request #4
Conflicts:
manifests/host.pp
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/host.pp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/manifests/host.pp b/manifests/host.pp index c424e94..a26c013 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -10,8 +10,10 @@ 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}.${::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}.${::lsbdistcodename}", "puppet:///modules/munin/config/host/munin.conf.header.${::operatingsystem}", "puppet:///modules/munin/config/host/munin.conf.header" ], order => 05, |