From e56702c0d0503e961ecb2e8e6336011199377a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Sat, 28 Sep 2013 12:30:10 +0300
Subject: [PATCH] puppet: Fixes for puppetmaster SELinux contexts.

---
 puppet/manifests/init.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 6aeefae..b361557 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -352,10 +352,14 @@ class puppet::server::common inherits puppet::client {
             seltype => "usr_t",
             require => File[$puppet_datadir],
         }
-        selinux::manage_fcontext { "/srv/puppet(/.*)?":
+        selinux::manage_fcontext { "/srv/puppet":
             type   => "usr_t",
             before => File["/srv/puppet"],
         }
+        selinux::manage_fcontext { "/srv/puppet/.*":
+            type   => $seltype,
+            before => File["/srv/puppet"],
+        }
     } else {
         file { "/srv/puppet":
             ensure  => directory,