diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:53:25 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:53:25 +0200 |
| commit | 6d381d767a8616798657ff064f5299ad333d0670 (patch) | |
| tree | 31f0438a72eee3edd87cdb8469084be01bd4ae08 | |
| parent | e03d70f0025bc5ac7c50e3cb0a9970882914eb74 (diff) | |
| parent | 28f3d5f36012a6d3a4303a036602694f1f581299 (diff) | |
Merge branch 'master' into _clean
| -rw-r--r-- | ikiwiki.setup | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup index 16788ee..2989c0e 100644 --- a/ikiwiki.setup +++ b/ikiwiki.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', + git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki', # 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) |