diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-09-03 16:27:33 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-09-03 16:27:33 +0200 |
| commit | 7919f8bdad802db4311cdbc4d20737367d3dabf7 (patch) | |
| tree | 596b6d44995d4a14200fb10f1fdb7f08bd49404f | |
| parent | a04de07a87e13c7a39773ca0a45ec749a6396718 (diff) | |
| parent | 30b66cc9d018535f5a82f1b1bba8639bad1685ec (diff) | |
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_da.setup
| -rw-r--r-- | ikiwiki_da.setup | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 8f2cc99..1526330 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -33,7 +33,7 @@ use IkiWiki::Setup::Standard { # users who are banned from the wiki banned_users => [], # where the source of the wiki is located - srcdir => 'content_dummy_da', + srcdir => $basedir . '/content_dummy_da', # where to build the wiki destdir => $webdir, # base url to the wiki @@ -57,9 +57,9 @@ use IkiWiki::Setup::Standard { templatedir => 'templates_da', # base wiki source location underlaydirs => [ - 'content_da', + $basedir . '/content_da', ], - underlaydir => 'basewiki_da', + underlaydir => $basedir . '/basewiki_da', # display verbose messages when building? #verbose => 1, # log to syslog? @@ -151,7 +151,7 @@ use IkiWiki::Setup::Standard { # mode for git_wrapper (can safely be made suid) git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) - #historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]];hb=master-da', + #historyurl => 'http://source.' . $domain . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]];hb=master-da', # gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted) #diffurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]', # where to pull and push changes (set to empty string to disable) |