diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:22:26 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:22:26 +0200 |
| commit | 1ee90b73470289496a60f6e9bf5c4d6e889df66b (patch) | |
| tree | 36c5b8c7c78b50a86e31eef1b1b9a3762a290ffa /ikiwiki_da.setup | |
| parent | fff174199f67fd16d99928da6966b0a1d42ee960 (diff) | |
| parent | e21cb3e0d708449b29d0ab9b66e4f7b25aaefe8a (diff) | |
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_da.setup
Diffstat (limited to 'ikiwiki_da.setup')
| -rw-r--r-- | ikiwiki_da.setup | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index cfdf2b4..52a36fd 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -15,7 +15,7 @@ use IkiWiki::Setup::Standard { # users who are banned from the wiki banned_users => [], # where the source of the wiki is located - srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content_dummy_da', + srcdir => 'content_dummy_da', # where to build the wiki destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org', # base url to the wiki @@ -38,9 +38,10 @@ use IkiWiki::Setup::Standard { templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_da', # base wiki source location underlaydirs => [ - $ENV{'HOME'} . '/private_webdata/samplewiki/content_da', + 'content_da', ], - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_da', + # Some plugins (smiley in particular) need non-localized master underlay + underlaydir => 'basewiki_da', # display verbose messages when building? #verbose => 1, # log to syslog? @@ -132,7 +133,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://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]];hb=master-da', + #historyurl => 'http://' . $githost . '/gitweb.cgi?p=wiki.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://git.example.org/gitweb.cgi?p=wiki.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) |