From: Joey Hess Date: Mon, 12 Nov 2007 17:33:39 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.12~5 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3c3135c6a8e3f0770c6efdb8c5765affedb61106?hp=e589b2aa6122420fd974a258411bdfb537eabc73 Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- diff --git a/debian/changelog b/debian/changelog index f2c296ab1..7e2315b60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,7 +23,13 @@ ikiwiki (2.12) UNRELEASED; urgency=low * Add xmlns attribute on html element in templates; pages can now validate. - -- Josh Triplett Thu, 08 Nov 2007 12:58:28 -0800 + [ Joey Hess ] + * In the example setup file, use mode 6755 for the git post-update hook. + It needs to be setgid if the master repo is a shared repository, so + that pushes into the working copy repository happen as the same group, + avoiding permissions problems. + + -- Joey Hess Mon, 12 Nov 2007 12:26:45 -0500 ikiwiki (2.11) unstable; urgency=low diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup index 3a0658e9d..e36559112 100644 --- a/doc/ikiwiki.setup +++ b/doc/ikiwiki.setup @@ -84,7 +84,7 @@ use IkiWiki::Setup::Standard { # # post-update hook script, which may not be # # what you want. # wrapper => "/git/wiki.git/hooks/post-update", - # wrappermode => "04755", + # wrappermode => "06755", # # Enable mail notifications of commits. # notify => 1, #},