summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-31 16:17:35 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-31 16:17:35 +0200
commitcca56fb84cb317dcc2fe2427f2f661546fe2a83d (patch)
tree870d46832e9a01fe521b7056b1f421d696320543
parentbd3fdf887bdfc2f935214847a68805b174fcf2d3 (diff)
parentf627d167c1b2b246fab81dd75b4cfea2462d8ee5 (diff)
Merge branch 'nb' into _multilang
Conflicts (resolved manually): ikiwiki_nb.setup
-rw-r--r--ikiwiki_nb.setup2
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index fcfe72b..3e19323 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.setup
@@ -123,7 +123,7 @@ use IkiWiki::Setup::Standard {
# git plugin
# git hook to generate
- git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb',
+ git_wrapper => $gitdir . '/post-update-ikiwiki-nb',
# mode for git_wrapper (can safely be made suid)
#git_wrappermode => '06755',
# gitweb url to show file history ([[file]] substituted)