From e2f086a7afda71513630aba830968b4c3daa2ef0 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 4 Jan 2012 01:34:37 +0200
Subject: [PATCH] Cleaned up vsroom module

---
 vsroom/manifests/init.pp | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/vsroom/manifests/init.pp b/vsroom/manifests/init.pp
index c2583da..f155098 100644
--- a/vsroom/manifests/init.pp
+++ b/vsroom/manifests/init.pp
@@ -28,8 +28,8 @@ class vsroom {
     file { "/usr/local/src/vsroom.tar.gz":
         ensure => present,
         mode   => 0644,
-        owner  => root,
-        group  => root,
+        owner  => "root",
+        group  => "root",
         source => "puppet:///files/packages/${vsroom_package}",
         links  => follow,
     }
@@ -48,9 +48,9 @@ class vsroom {
     if $vsroom_datadir {
         file { "${vsroom_datadir}":
             ensure  => directory,
-            mode    => 0755,
-            owner   => root,
-            group   => root,
+            mode    => 0750,
+            owner   => "root",
+            group   => "vsroom",
         }
 
         file { "/var/lib/vsroom":
@@ -61,20 +61,12 @@ class vsroom {
     } else {
         file { "/var/lib/vsroom":
             ensure  => directory,
-            mode    => 0755,
-            owner   => root,
-            group   => root,
+            mode    => 0750,
+            owner   => "root",
+            group   => "vsroom",
         }
     }
 
-    file { "/var/lib/vsroom/.htpasswd":
-        ensure  => present,
-        mode    => 0640,
-        owner   => root,
-        group   => $apache::sslserver::group,
-        require => File["/var/lib/vsroom"],
-    }
-
     $htdocs = $operatingsystem ? {
         "ubuntu" => "/usr/local/share/vsroom/htdocs",
         default  => "/usr/share/vsroom/htdocs",