diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:21:06 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:21:06 +0200 |
| commit | fff174199f67fd16d99928da6966b0a1d42ee960 (patch) | |
| tree | 1fc39b01d123ddd5beabeb9abb4814cd9bf0beba /ikiwiki_nb.setup | |
| parent | e2ae264d5d6327ac1e45f422150d2dd518ac8f68 (diff) | |
| parent | cca56fb84cb317dcc2fe2427f2f661546fe2a83d (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
ikiwiki.setup
Diffstat (limited to 'ikiwiki_nb.setup')
| -rw-r--r-- | ikiwiki_nb.setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 5364fc7..46128ac 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -128,7 +128,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) |