From ef4d4981dd94e4223722cb386f8fde2c221299f3 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 1 Sep 2010 10:33:35 +0200 Subject: Fix use unocalized html and cgi extensions. --- ikiwiki_nb_admin.setup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ikiwiki_nb_admin.setup b/ikiwiki_nb_admin.setup index 273de3a..1773ef8 100644 --- a/ikiwiki_nb_admin.setup +++ b/ikiwiki_nb_admin.setup @@ -21,9 +21,9 @@ use IkiWiki::Setup::Standard { # base url to the wiki url => 'http://admin.wiki.example.org', # url to the ikiwiki.cgi - cgiurl => 'http://admin.wiki.example.org/ikiwiki.nb.cgi', + cgiurl => 'http://admin.wiki.example.org/ikiwiki.cgi', # cgi wrapper to generate - cgi_wrapper => $ENV{'HOME'} . '/public_cgi/admin.wiki.example.org/ikiwiki.nb.cgi', + cgi_wrapper => $ENV{'HOME'} . '/public_cgi/admin.wiki.example.org/ikiwiki.cgi', # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode => '00755', # rcs backend to use @@ -55,7 +55,7 @@ use IkiWiki::Setup::Standard { # extension to use for new pages default_pageext => 'mdwn', # extension to use for html files - htmlext => 'nb.html', + htmlext => 'html', # strftime format string to display date timeformat => '%c', # UTF-8 locale to use -- cgit v1.2.3 From 67b437b0cbbb828ac4b4a8c9e0a8a2a588041a65 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 1 Sep 2010 10:38:54 +0200 Subject: Fix set locale nb_NO (not bogus no_NB). --- ikiwiki_nb_admin.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki_nb_admin.setup b/ikiwiki_nb_admin.setup index 1773ef8..aad7eae 100644 --- a/ikiwiki_nb_admin.setup +++ b/ikiwiki_nb_admin.setup @@ -59,7 +59,7 @@ use IkiWiki::Setup::Standard { # strftime format string to display date timeformat => '%c', # UTF-8 locale to use - locale => 'no_NB.UTF-8', + locale => 'nb_NO.UTF-8', # put user pages below specified page userdir => '', # how many backlinks to show before hiding excess (0 to show all) -- cgit v1.2.3 From e1100c2f010d4f670b8de2d1ccb5549c387ac5fe Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 1 Sep 2010 10:40:11 +0200 Subject: Fix generalize paths and URLs iki ikiwiki setup file. --- ikiwiki_nb_admin.setup | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/ikiwiki_nb_admin.setup b/ikiwiki_nb_admin.setup index aad7eae..c895e8d 100644 --- a/ikiwiki_nb_admin.setup +++ b/ikiwiki_nb_admin.setup @@ -5,6 +5,24 @@ # wrappers and build the wiki. # # Remember to re-run ikiwiki --setup any time you edit this file. + +our $libdir; +our $adminwebdir; +our $admincgidir; +our $gitdir; +our $adminwebhost; +our $githost; +our $gitrepo; +BEGIN { + $libdir = $ENV{'PWD'} . '/perl'; + $adminwebdir = 'build/html-admin'; + $admincgidir = 'build/cgi-admin'; + $gitdir = 'build/git'; + $adminwebhost = 'admin.wiki.example.org'; + $githost = 'git.example.org'; + $gitrepo = 'wiki'; +} + use IkiWiki::Setup::Standard { # name of the wiki wikiname => 'MyWiki', @@ -15,15 +33,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', + srcdir => 'content', # where to build the wiki - destdir => $ENV{'HOME'} . '/public_websites/admin.wiki.example.org', + destdir => $adminwebdir, # base url to the wiki - url => 'http://admin.wiki.example.org', + url => 'http://' . $adminwebhost . '/', # url to the ikiwiki.cgi - cgiurl => 'http://admin.wiki.example.org/ikiwiki.cgi', + cgiurl => 'http://' . $adminwebhost . '/ikiwiki.cgi', # cgi wrapper to generate - cgi_wrapper => $ENV{'HOME'} . '/public_cgi/admin.wiki.example.org/ikiwiki.cgi', + cgi_wrapper => $admincgidir . '/ikiwiki.cgi', # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode => '00755', # rcs backend to use @@ -35,9 +53,9 @@ use IkiWiki::Setup::Standard { disable_plugins => [qw{ }], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates', + templatedir => 'templates', # base wiki source location - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki', + underlaydir => 'basewiki', # display verbose messages when building? #verbose => 1, # log to syslog? @@ -69,7 +87,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 => $libdir, # environment variables ENV => {}, # regexp of source files to ignore @@ -89,7 +107,7 @@ use IkiWiki::Setup::Standard { # public access key id #amazon_s3_key_id => 'XXXXXXXXXXXXXXXXXXXX', # file holding secret key (must not be readable by others!) - #amazon_s3_key_id => $ENV{'HOME'} . '/secret_webdata/s3_key', + #amazon_s3_key_id => 's3_key', # globally unique name of bucket to store wiki in #amazon_s3_bucket => 'mywiki', # a prefix to prepend to each page name @@ -125,13 +143,13 @@ use IkiWiki::Setup::Standard { # git plugin # git hook to generate - git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb-admin', + git_wrapper => $gitdir . '/post-update-ikiwiki-nb-admin', # 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-nb', + historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.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]]', + diffurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.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 -- cgit v1.2.3