Trying to keep the right permissions and ownership at /etc/puppet

diff --git a/manifests/puppet.pp b/manifests/puppet.pp
index 51a355b723992ae5f98941c49b0701350c4e4ec7..5dd5dd909ee8f16ef2be6d66cf2c039637676866 100644 (file)
--- a/manifests/puppet.pp
+++ b/manifests/puppet.pp
@@ -19,6 +19,29 @@ class puppet {
     owner   => puppet,
     group   => puppet, 
     mode    => 0640,
+    require => User["puppet"],
+  }
+
+  file { "/etc/puppet/manifests":
+    ensure  => directory,
+    owner   => puppet,
+    group   => puppet, 
+    recurse => inf,
+    require => User["puppet"],
+  }
+
+  file { "/etc/puppet/modules":
+    ensure  => directory,
+    owner   => puppet,
+    group   => puppet, 
+    recurse => inf,
+    require => User["puppet"],
+  }
+
+  file { "/etc/puppet/templates":
+    ensure  => directory,
+    owner   => puppet,
+    group   => puppet, 
     recurse => inf,
     require => User["puppet"],
   }

diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index 0fcba465b3119cd4e5709c836005e8e65bd2a043..7e2b33b6d542da25d1c1ed769e9ac643695d074f 100644 (file)
--- a/manifests/puppetd.pp
+++ b/manifests/puppetd.pp
@@ -42,10 +42,17 @@ class puppetd inherits puppet {
     file { "/etc/puppet/puppet.conf":
       ensure  => file,
       owner   => puppet,
-      group   => root,
+      group   => puppet,
       mode    => 0640,
       content => template("puppet/puppet-node.conf.erb"),
     }
+  } else {
+    file { "/etc/puppet/puppet.conf":
+      ensure  => file,
+      owner   => puppet,
+      group   => puppet,
+      mode    => 0640,
+    }
   }
 
   # cron rule to restart puppet minutes after puppetmaster is restarted

diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp
index a961cadf966e93c14713fd728d5ff62aa37ecbe2..f542f1f6e17fb7dabe479a13ed72942df20d14d5 100644 (file)
--- a/manifests/puppetmasterd.pp
+++ b/manifests/puppetmasterd.pp
@@ -53,6 +53,28 @@ class puppetmasterd {
     notify  => Service['puppetmaster'],
   }
 
+  file { "/etc/puppet/files":
+    ensure  => directory,
+    owner   => puppet,
+    group   => puppet, 
+    recurse => inf,
+    require => User["puppet"],
+  }
+
+  file { "/etc/puppet/auth.conf":
+    ensure  => file,
+    owner   => puppet,
+    group   => puppet, 
+    require => User["puppet"],
+  }
+
+  file { "/etc/puppet/fileserver.conf":
+    ensure  => file,
+    owner   => puppet,
+    group   => puppet, 
+    require => User["puppet"],
+  }
+
   case $puppetmaster_servertype {
     'mongrel': {
       include nginx::puppetmaster