summaryrefslogtreecommitdiff
path: root/ikiwiki_nb.setup
diff options
context:
space:
mode:
Diffstat (limited to 'ikiwiki_nb.setup')
-rw-r--r--ikiwiki_nb.setup22
1 files changed, 9 insertions, 13 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index e844b58..578b975 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.setup
@@ -15,15 +15,15 @@ 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',
+ srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content_dummy_nb',
# where to build the wiki
destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org',
# base url to the wiki
url => 'http://wiki.example.org',
# url to the ikiwiki.cgi
- cgiurl => 'http://wiki.example.org/ikiwiki.cgi',
+ cgiurl => 'http://wiki.example.org/ikiwiki.nb.cgi',
# cgi wrapper to generate
- cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.cgi',
+ cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.nb.cgi',
# mode for cgi_wrapper (can safely be made suid)
cgi_wrappermode => '06755',
# rcs backend to use
@@ -36,9 +36,9 @@ use IkiWiki::Setup::Standard {
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_nonedit_l10n/nb",
+ $ENV{'HOME'} . '/private_webdata/samplewiki/content_l10n/nb',
+ #$ENV{'HOME'} . '/private_webdata/samplewiki/smiley_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_nonedit',
@@ -59,15 +59,11 @@ use IkiWiki::Setup::Standard {
# extension to use for new pages
default_pageext => 'mdwn',
# extension to use for html files
- htmlext => 'html',
+ htmlext => 'nb.html',
# 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)
@@ -137,13 +133,13 @@ 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
+ #historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]];hb=master-nb',
# 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)
#gitorigin_branch => 'samplewiki',
# branch that the wiki is stored in
- #gitmaster_branch => 'master',
+ #gitmaster_branch => 'master-nb',
# htmlscrubber plugin
# PageSpec specifying pages not to scrub