From 03ae395388a0dacefa5c6249c027e467a651a1c3 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 9 Mar 2011 14:02:47 +0200
Subject: [PATCH] Try to get collabfarm.py from puppet file server

---
 wiki/manifests/init.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp
index 75a787f..077d897 100644
--- a/wiki/manifests/init.pp
+++ b/wiki/manifests/init.pp
@@ -187,7 +187,9 @@ class wiki::collab::base {
         mode    => 0660,
         owner   => collab,
         group   => collab,
-        source  => "/usr/local/src/graphingwiki/collab/config/collabfarm.py",
+        source  => [ "puppet:///private/wiki/collabfarm.py",
+                     "puppet:///files/wiki/collabfarm.py",
+                     "/usr/local/src/graphingwiki/collab/config/collabfarm.py", ],
         replace => false,
         require => File["/srv/wikis/collab/config"],
     }
@@ -222,7 +224,7 @@ class wiki::collab::base {
         require => File["/srv/wikis/collab/htdocs"],
     }
 
-    file { "/etc/local/collab":
+    file { [ "/etc/local", "/etc/local/collab" ]:
         ensure => directory,
         mode   => 0755,
         owner  => root,