diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 23:06:01 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 23:06:01 +0200 |
| commit | 586fdb2600aa4ab49f043d532ac90ce58c61afd3 (patch) | |
| tree | eb028caffcdfa0ec768d0faa3369dc21c353599e /ikiwiki_da.setup | |
| parent | fad3a41c440322f92d108ef74ec30feaed3dd12b (diff) | |
| parent | 207ac2343b5dd658f3d380dd92d1260fb2135b43 (diff) | |
Merge branch 'nonedit' into allinone-da
Conflicts (manually resolved):
Makefile
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 1f68a88..78b0f5f 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -11,18 +11,19 @@ use IkiWiki::Setup::Standard { adminemail => 'me@example.org', # Be sure to customise these.. - srcdir => $ENV{'HOME'} . "/private_webdata/examplewiki/content", + srcdir => $ENV{'HOME'} . "/private_webdata/examplewiki/content_dummy", destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org/wiki", url => "http://wiki.example.org", cgiurl => "http://wiki.example.org/ikiwiki.cgi", - templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_l10n/da", + templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit_l10n/da", underlaydirs => [ + $ENV{'HOME'} . "/private_webdata/samplewiki/content", #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/da", - $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_l10n/da", + $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit_l10n/da", ], # Some plugins (smiley in particular) need non-localized master underlay - underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki", + underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit", # Git stuff. #rcs => "git", |