diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:53:53 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:53:53 +0200 |
| commit | dd311ea7e41acd7620c89ab417b6061001f3e30f (patch) | |
| tree | a44f2bad5c5078fa1125df0431c97a07e47ea95b | |
| parent | 7edcf5056368129f095a98347b763721646f07ee (diff) | |
| parent | 28f3d5f36012a6d3a4303a036602694f1f581299 (diff) | |
Merge branch 'master' into _da
Conflicts (manually resolve):
ikiwiki_da.setup
| -rw-r--r-- | ikiwiki_da.setup | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index ba07e85..fabfdd1 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.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-da', + git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-da', # 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) |