summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-30 19:54:48 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-30 19:54:48 +0200
commit1801e74f6bf62f75e0872ef3865d8b7cf368ad0a (patch)
tree47e0ed51e27c58f43fd99c3e15ee571340337804
parent9a8fa6000f3ba80db044b609db2596d299c3f410 (diff)
parent6d381d767a8616798657ff064f5299ad333d0670 (diff)
Merge branch '_clean' into allinone
-rw-r--r--ikiwiki.setup6
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup
index 9b41cc6..2e11538 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
@@ -128,9 +128,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)