summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-30 19:54:20 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-30 19:54:34 +0200
commit2531d1bc5c30380c4bab912f0eb215fc30d3574e (patch)
tree54607b803bf35d1d437b6685d3d1d4ed6db6b9f9
parent38fe29040522efe0941ba766245826e4487728e8 (diff)
parent28f3d5f36012a6d3a4303a036602694f1f581299 (diff)
Merge branch 'master' into _nb
Conflicts (manually resolved): ikiwiki_nb.setup
-rw-r--r--ikiwiki_nb.setup6
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index 44ec2d8..806c397 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
@@ -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-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
# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)