diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:54:48 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:54:48 +0200 |
| commit | cba18592fa1db4c492cb99b29dfa8e23edee0f84 (patch) | |
| tree | 1a68fe72515d3dd5146b11262f4a3722e6384207 | |
| parent | 845babe7307e76ce905d45dd74a14dcd3d67cecb (diff) | |
| parent | 2531d1bc5c30380c4bab912f0eb215fc30d3574e (diff) | |
Merge branch '_nb' into nb
| -rw-r--r-- | ikiwiki_nb.setup | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 44ec2d8..806c397 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -27,7 +27,7 @@ use IkiWiki::Setup::Standard { # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode => '00755', # rcs backend to use - rcs => '', + rcs => 'git', # plugins to add to the default configuration add_plugins => [], # plugins to disable @@ -123,9 +123,9 @@ 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 => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb', # mode for git_wrapper (can safely be made suid) - #git_wrappermode => '06755', + git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) #historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master # gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted) |