summaryrefslogtreecommitdiff
path: root/ikiwiki_nb.setup
diff options
context:
space:
mode:
Diffstat (limited to 'ikiwiki_nb.setup')
-rw-r--r--ikiwiki_nb.setup15
1 files changed, 10 insertions, 5 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index 1b43923..e844b58 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.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',
+ srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content_dummy',
# where to build the wiki
destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org',
# base url to the wiki
@@ -33,14 +33,15 @@ use IkiWiki::Setup::Standard {
# plugins to disable
disable_plugins => [],
# location of template files
- templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_l10n/nb',
+ templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit_l10n/nb',
# base wiki source location
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',
# display verbose messages when building?
#verbose => 1,
# log to syslog?
@@ -62,7 +63,11 @@ use IkiWiki::Setup::Standard {
# strftime format string to display date
timeformat => '%c',
# UTF-8 locale to use
+<<<<<<< HEAD:ikiwiki_nb.setup
+ locale => 'no_NB.UTF-8',
+=======
locale => 'nb_NO.UTF-8',
+>>>>>>> _nb:ikiwiki_nb.setup
# put user pages below specified page
userdir => '',
# how many backlinks to show before hiding excess (0 to show all)
@@ -72,7 +77,7 @@ use IkiWiki::Setup::Standard {
# force ikiwiki to use a particular umask
#umask => 022,
# extra library and plugin directory
- libdir => $ENV{'HOME'} . '/private_webdata/samplewiki/perl',
+ libdir => 'perl',
# environment variables
ENV => {},
# regexp of source files to ignore