Using umask and setting www-data as group

diff --git a/manifests/init.pp b/manifests/init.pp
index fb8f7dae7b99559ed58735fe0fc1e05d778c6f80..254adda3480313a9bb0591282573daffee51bba6 100644 (file)
--- 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"],
-       }
       }
     }
   }

diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb
index dae8047acf8bfe0180fd9faa9c15c26767a0c421..6a30cfa95407f28b09ad7987bb60e24c9651c997 100644 (file)
--- a/templates/ikiwiki.setup.erb
+++ b/templates/ikiwiki.setup.erb
@@ -126,7 +126,7 @@ use IkiWiki::Setup::Standard {
        # Cost of generating a password using Authen::Passphrase::BlowfishCrypt
        #password_cost => 8,
        # Uncomment to force ikiwiki to run with a particular umask.
-       #umask => 022,
+       umask => 002,
        # Default settings for the recentchanges page.
        #recentchangespage => "recentchanges",
        #recentchangesnum => 100,