From: admin Date: Thu, 19 May 2011 20:37:15 +0000 (-0400) Subject: commit of setup files X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b5f1da4bbaff2bb472fd80e38a9b70fa026236a1 commit of setup files --- diff --git a/ikiwiki.setup b/ikiwiki.setup index 1e209d572..89f442f8e 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -17,7 +17,7 @@ adminuser: # users who are banned from the wiki banned_users: [] # 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 @@ -139,9 +139,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