aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-25 19:19:26 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-25 19:19:26 -0200
commit25c9378cd03d6c8324f80959418049de1ce392ab (patch)
tree124c6ed86be744bd6cb4d1ef40712c9e0add9fba
parentc547fbda55bd8b7fdd2acc190ee2f7cf758e6986 (diff)
downloadpuppet-ikiwiki-25c9378cd03d6c8324f80959418049de1ce392ab.tar.gz
puppet-ikiwiki-25c9378cd03d6c8324f80959418049de1ce392ab.tar.bz2
Setting wrappermode for post-update hook and running ikiwiki as www-data
-rw-r--r--manifests/init.pp2
-rw-r--r--templates/ikiwiki.setup.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 65dc2cb..8a0048e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -41,7 +41,7 @@ class ikiwiki {
case $ensure {
'present': {
exec { "ikiwiki --setup /etc/ikiwiki/$name.setup":
- user => root,
+ user => www-data,
refreshonly => true,
}
diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb
index 2aa06cd..359932c 100644
--- a/templates/ikiwiki.setup.erb
+++ b/templates/ikiwiki.setup.erb
@@ -83,7 +83,7 @@ use IkiWiki::Setup::Standard {
# post-update hook script, which may not be
# what you want.
wrapper => "/var/git/repositories/<%= name %>.git/hooks/post-update",
- wrappermode => "06755",
+ wrappermode => "04550",
},
#{
# # The monotone netsync hook.