diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 00:26:35 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 00:26:35 +0200 |
| commit | a6f7e2146ef02f218f9180babd3fb3741c58e810 (patch) | |
| tree | 90cc66d8643c53c749ae04adcefb45933f093cd3 /ikiwiki_nb.setup | |
| parent | b440876a339be7e980220b9362c0fa1173257029 (diff) | |
| parent | 7d0d5f88ee5f12f0ae7ed872d783809fe34f22c0 (diff) | |
Merge branch 'nonedit' into allinone-nb
Conflicts (manually resolved):
ikiwiki_nb.setup
Also, use nb setup files in Makefile.
Diffstat (limited to 'ikiwiki_nb.setup')
| -rw-r--r-- | ikiwiki_nb.setup | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 295f618..de710dc 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -11,18 +11,19 @@ use IkiWiki::Setup::Standard { adminemail => 'me@example.org', # Be sure to customise these.. - srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content", + srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_dummy", destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org", url => "http://wiki.example.org", cgiurl => "http://wiki.example.org/ikiwiki.cgi", - templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_l10n/nb", + templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit_l10n/nb", underlaydirs => [ + $ENV{'HOME'} . "/private_webdata/samplewiki/content", #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/nb", - $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_l10n/nb", + $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit_l10n/nb", ], # 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", # Subversion stuff. #rcs => "svn", |