From 06f2527d92d9444238a51b1b182377d5754c7646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Fri, 23 Mar 2012 12:39:43 +0200
Subject: [PATCH] Added base collab and user creation to wiki::collab::base.

---
 wiki/manifests/init.pp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp
index 03733e4..63ee207 100644
--- a/wiki/manifests/init.pp
+++ b/wiki/manifests/init.pp
@@ -292,6 +292,28 @@ class wiki::collab::base {
         source => "puppet:///modules/wiki/collab-httpd.conf",
     }
 
+    exec { "collab-create collab collab":
+        path    => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
+        cwd     => "/",
+        user    => "collab",
+        group   => "collab",
+        creates => "/srv/wikis/collab/wikis/collab",
+        require => [ File["/etc/local/collab/collab.ini"],
+                     Class["wiki::collab"],
+                     File["/srv/wikis/collab/wikis"],
+                     File["/srv/wikis/collab/htdocs/.htaccess"],
+                     Exec["collab-copy-underlay"], ],
+    }
+    exec { "collab-account-create -f -r collab":
+        path    => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
+        cwd     => "/",
+        user    => "collab",
+        group   => "collab",
+        unless  => "egrep '^name=collab$' /srv/wikis/collab/user/*",
+        require => Exec["collab-create collab collab"],
+        before  => Cron["collab-htaccess"],
+    }
+
     cron { "collab-htaccess":
         ensure  => present,
         command => $operatingsystem ? {