From e17c0e0fae335470971cc628d71a798d168e70af Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 29 Mar 2011 17:18:40 -0400
Subject: fix merge conflict syntax error

---
 manifests/host.pp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'manifests')

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',
-- 
cgit v1.2.3