From 44bbad6862f4981a78cfeeef70c04082fcda19ad Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 1 Jun 2011 12:45:42 +0300
Subject: [PATCH] Fixed some system user home directories

---
 user/manifests/init.pp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/user/manifests/init.pp b/user/manifests/init.pp
index cebba98..1f7c628 100644
--- a/user/manifests/init.pp
+++ b/user/manifests/init.pp
@@ -6,6 +6,20 @@ import "classes.pp"
 #
 class user::system {
 
+    file { "/var/empty":
+        ensure => directory,
+        mode   => 0755,
+        owner  => "root",
+        group  => $operatingsystem ? {
+            openbsd => "wheel",
+            default => "root",
+        },
+    }
+
+    User {
+        require => File["/var/empty"],
+    }
+
     @group { "httpsd":
         ensure => present,
         gid    => 800,
@@ -161,7 +175,7 @@ class user::system {
         uid     => 812,
         gid     => 812,
         comment => "Service Collab",
-        home    => "/home/collab",
+        home    => "/var/empty",
         shell   => "/sbin/nologin",
         require => Group["collab"],
     }
@@ -176,7 +190,7 @@ class user::system {
         uid     => 813,
         gid     => 813,
         comment => "Service AbuseHelper",
-        home    => "/var/lib/ah2",
+        home    => "/var/empty",
         shell   => "/sbin/nologin",
         require => Group["abusehel"],
     }
@@ -186,11 +200,11 @@ class user::system {
         ensure => present,
         gid    => 814,
     }
-    @user { "vsroom":   
+    @user { "vsroom":
         uid     => 814,
         gid     => 814,
         comment => "Service VSRoom",
-        home    => "/var/lib/vsroom",
+        home    => "/var/empty",
         shell   => "/sbin/nologin",
         require => Group["vsroom"],
     }