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
commit4b17b240c907fb35dd5bf9c93fa71c63df75f023 (patch)
treee0796a6b2c6b57b8062a926283347186c052eeec
parent947c2b6950b88ccac06cddff8fce4fcb66afd7fc (diff)
parentdd311ea7e41acd7620c89ab417b6061001f3e30f (diff)
Merge branch '_da' into allinone-da
-rw-r--r--ikiwiki_da.setup6
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup
index 58dafea..225d3cf 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
@@ -129,9 +129,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-da',
# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)