From 5684831d9ed9751d7424a420268aee15fb88fa9f Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Fri, 5 Apr 2013 13:19:44 +0300
Subject: [PATCH] wiki: Use ramdisk for collab cache by default

---
 wiki/manifests/init.pp | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp
index e0f152f..1fccdcf 100644
--- a/wiki/manifests/init.pp
+++ b/wiki/manifests/init.pp
@@ -306,6 +306,22 @@ class wiki::collab {
         before  => Exec["collab-create collab collab"],
     }
 
+    mount { "/srv/wikis/collab/cache":
+        name    => $wiki_datadir ? {
+            undef   => "/srv/wikis/collab/cache",
+            default => "${wiki_datadir}/collab/cache",
+        },
+        ensure  => mounted,
+        atboot  => true,
+        device  => "none",
+        fstype  => "tmpfs",
+        options => "uid=collab,gid=collab,mode=2770",
+        dump    => "0",
+        pass    => "0",
+        require => File["/srv/wikis/collab/cache"],
+        before  => Exec["collab-create collab collab"],
+    }
+
     file { [ "/etc/local", "/etc/local/collab" ]:
         ensure => directory,
         mode   => "0755",
@@ -406,32 +422,6 @@ class wiki::collab::base {
 }
 
 
-# Use ramdisk for collab cache.
-#
-class wiki::collab::ramcache {
-
-    mount { "/srv/wikis/collab/cache":
-        name    => $wiki_datadir ? {
-            undef   => "/srv/wikis/collab/cache",
-            default => "${wiki_datadir}/collab/cache",
-        },
-        ensure  => mounted,
-        atboot  => true,
-        device  => "none",
-        fstype  => "tmpfs",
-        options => "uid=collab,gid=collab,mode=2770",
-        dump    => "0",
-        pass    => "0",
-        require => File["/srv/wikis/collab/cache"],
-        before  => $::operatingsystem ? {
-            "ubuntu" => Service["apache2"],
-            default  => Service["httpsd"],
-        },
-    }
-
-}
-
-
 # Install moin package.
 #
 # === Parameters