summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-30 19:54:49 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-30 19:54:49 +0200
commitc3415931acf4f0b1eefd51b2efd42bed952fc5fe (patch)
tree589d022757d40fcb08c8a07c5d126536c8b821df
parente1ff9f3b2dc6b4163c3470982fe1ca02123b65d2 (diff)
parent6b749c44e951142b63f2ef89ae8adda972406554 (diff)
Merge branch 'allinone-nb' into allinone-multilang
-rw-r--r--ikiwiki_nb.setup6
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index 213268f..5364fc7 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
@@ -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-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-nb',
# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)