diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-01-25 16:01:31 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-01-25 16:01:31 -0200 |
| commit | afad37ce303e2f6a9819d5c0f203f25ca6ff0789 (patch) | |
| tree | 3b1112dcaa5c13c1e08b6f8e8a79053d17c4eb8c | |
| parent | 9bc52e1c7cfacac0742a83c0c0cadb133c2f74ab (diff) | |
| download | puppet-ikiwiki-afad37ce303e2f6a9819d5c0f203f25ca6ff0789.tar.gz puppet-ikiwiki-afad37ce303e2f6a9819d5c0f203f25ca6ff0789.tar.bz2 | |
Using umask and setting www-data as group
| -rw-r--r-- | manifests/init.pp | 16 | ||||
| -rw-r--r-- | templates/ikiwiki.setup.erb | 2 |
2 files changed, 5 insertions, 13 deletions
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"], - } } } } diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb index dae8047..6a30cfa 100644 --- 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, |