diff options
| author | Micah Anderson <micah@riseup.net> | 2011-03-29 17:18:40 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-03-29 17:18:40 -0400 |
| commit | e17c0e0fae335470971cc628d71a798d168e70af (patch) | |
| tree | a15d4a298d2349a7d29c802c314394524c7f5917 /manifests | |
| parent | a08b5db5d00980233fc5fea21e292f3b433119a0 (diff) | |
fix merge conflict syntax error
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 cf445ce..9d30d6a 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -18,6 +18,8 @@ class munin::host inherits munin "puppet:///modules/munin/config/host/munin.conf.header.$operatingsystem", "puppet:///modules/munin/config/host/munin.conf.header" ], notify => Exec['concat_/etc/munin/munin.conf'], + owner => root, group => 0, mode => 0644; + } concatenated_file { "/etc/munin/munin.conf": dir => '/var/lib/puppet/modules/munin/nodes', |