From afad37ce303e2f6a9819d5c0f203f25ca6ff0789 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 25 Jan 2010 16:01:31 -0200
Subject: Using umask and setting www-data as group

---
 manifests/init.pp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index fb8f7da..254adda 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -53,8 +53,8 @@ class ikiwiki {
           file { "${apache_sites_folder}/${name}/${instance}_src":
             ensure  => directory,
             owner   => gitosis,
-            group   => gitosis,
-            recurse => false,
+            group   => www-data,
+            recurse => true,
             notify  => Exec["ikiwiki --setup /etc/ikiwiki/$name.setup"],
             require => File["${apache_sites_folder}/${name}"],
           }
@@ -64,8 +64,8 @@ class ikiwiki {
           file { "${apache_sites_folder}/${name}/${instance}":
             ensure  => directory,
             owner   => gitosis,
-            group   => gitosis,
-            recurse => false,
+            group   => www-data,
+            recurse => true,
             require => File["${apache_sites_folder}/${name}"],
           }
         }
@@ -77,14 +77,6 @@ class ikiwiki {
             group   => root,
           }
         }
-
-       file { "${apache_sites_folder}/${name}/${instance}_src/.ikiwiki":
-         ensure  => directory,
-         owner   => www-data,
-         group   => www-data,
-         recurse => true,
-         require => File["${apache_sites_folder}/${name}/${instance}_src"],
-       }
       }
     }
   }
-- 
cgit v1.2.3