From e4168748a7409e0a380b89a9e4e45c35ac5a4c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Thu, 12 Jul 2012 21:10:14 +0300
Subject: [PATCH] Fixed SELinux error from wiki module when no datadir is set.

---
 wiki/manifests/init.pp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp
index 701e5ef..67a70e6 100644
--- a/wiki/manifests/init.pp
+++ b/wiki/manifests/init.pp
@@ -199,7 +199,7 @@ class wiki::collab::base {
     }
     selinux::manage_fcontext { "/srv/wikis(/.*)?":
         type   => "httpd_sys_rw_content_t",
-        before => File[$wiki_datadir],
+        before => File["/srv/wikis"],
     }
 
     file { [ "/srv/wikis/collab",
@@ -218,8 +218,12 @@ class wiki::collab::base {
         owner   => "collab",
         group   => "collab",
         seltype => "httpd_sys_rw_content_t",
-        require => [ File["/srv/wikis"], User["collab"], Group["collab"],
-                     Class["wiki::moin", "wiki::collab"], ],
+        require => [
+          File["/srv/wikis"],
+          User["collab"],
+          Group["collab"],
+          Class["wiki::moin", "wiki::collab"],
+        ],
         before  => Exec["collab-create collab collab"],
     }