From 52f6f48f54dde1ef7058ef6ebe13f6f3b214b0bf Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Fri, 5 Apr 2013 14:27:08 +0300
Subject: [PATCH] wiki: Changed collab user home to /var/lib/collab

---
 user/manifests/init.pp |  2 +-
 wiki/manifests/init.pp | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/user/manifests/init.pp b/user/manifests/init.pp
index 9533dd9..c435367 100644
--- a/user/manifests/init.pp
+++ b/user/manifests/init.pp
@@ -183,7 +183,7 @@ class user::system {
         uid     => 812,
         gid     => 812,
         comment => "Service Collab",
-        home    => "/var/empty",
+        home    => "/var/lib/collab",
         shell   => "/sbin/nologin",
         require => Group["collab"],
     }
diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp
index 6020fee..913e9cc 100644
--- a/wiki/manifests/init.pp
+++ b/wiki/manifests/init.pp
@@ -183,6 +183,15 @@ class wiki::collab {
         },
     }
 
+    file { "/var/lib/collab":
+        ensure  => directory,
+        mode    => "0700",
+        owner   => "collab",
+        group   => "collab",
+        require => User["collab"],
+        before  => File["/srv/wikis"],
+    }
+
     if $wiki_datadir {
         file { $wiki_datadir:
             ensure  => directory,
@@ -231,7 +240,7 @@ class wiki::collab {
         owner   => "collab",
         group   => "collab",
         seltype => "httpd_sys_rw_content_t",
-        require => [ File["/srv/wikis"], User["collab"], Group["collab"] ],
+        require => [ File["/srv/wikis"], User["collab"] ],
         before  => Exec["collab-create collab collab"],
     }