* 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.

diff --git a/debian/changelog b/debian/changelog
index f2c296ab1c39c2df872484a7daa8353278832eaf..7e2315b60ab1fe08da0cce70df1e7272d3c41ea3 100644 (file)
--- 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 <josh@freedesktop.org>  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 <joeyh@debian.org>  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 3a0658e9d29824c06b2b76ef15dd9b288932004a..e36559112697ae6f2bf4d855d6ce2589669126e0 100644 (file)
--- 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,
                #},