Merge branch 'setup' of ssh://ikiwiki.branchable.com into setup

[git.ikiwiki.info.git] / ikiwiki.setup

diff --git a/ikiwiki.setup b/ikiwiki.setup
index b65285b896d76785539b47375d0726f14abd5d7d..476bca088e43008a0a43697bacdfaf142204d030 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -53,7 +53,7 @@ banned_users:
   - nicole.adams
   - Smith
 # where the source of the wiki is located
-srcdir: /home/b-ikiwiki/source
+srcdir: /home/b-ikiwiki/source/doc
 # where to build the wiki
 destdir: /home/b-ikiwiki/public_html
 # base url to the wiki
@@ -175,9 +175,9 @@ git_test_receive_wrapper: /home/b-ikiwiki/source.git/hooks/pre-receive
 untrusted_committers:
   - ikiwiki-anon
 # gitweb url to show file history ([[file]] substituted)
-historyurl: 'http://source.ikiwiki.branchable.com/?p=source.git;a=history;f=[[file]];hb=HEAD'
+historyurl: 'http://source.ikiwiki.branchable.com/?p=source.git;a=history;f=doc/[[file]];hb=HEAD'
 # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)
-diffurl: 'http://source.ikiwiki.branchable.com/?p=source.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]'
+diffurl: 'http://source.ikiwiki.branchable.com/?p=source.git;a=blobdiff;f=doc/[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]'
 # where to pull and push changes (set to empty string to disable)
 gitorigin_branch: origin
 # branch that the wiki is stored in