From bd2e6509af6199fd9c6dbe5313db6c4a7b060285 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 31 Aug 2010 16:49:25 +0200 Subject: Fix generalize paths and URLs iki ikiwiki setup file. --- ikiwiki_da.setup | 40 +++++++++++++++++++++++++++++----------- ikiwiki_nb.setup | 40 +++++++++++++++++++++++++++++----------- 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index b581763..4d3cb25 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.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 $webdir; +our $cgidir; +our $gitdir; +our $webhost; +our $githost; +our $gitrepo; +BEGIN { + $libdir = $ENV{'PWD'} . '/perl'; + $webdir = 'build/html'; + $cgidir = 'build/cgi'; + $gitdir = 'build/git'; + $webhost = '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_da', + srcdir => 'content_da', # where to build the wiki - destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org', + destdir => $webdir, # base url to the wiki - url => 'http://wiki.example.org', + url => 'http://' . $webhost . '/', # url to the ikiwiki.cgi - cgiurl => 'http://wiki.example.org/ikiwiki.da.cgi', + cgiurl => 'http://' . $webhost . '/ikiwiki.da.cgi', # cgi wrapper to generate - cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.da.cgi', + cgi_wrapper => $cgidir . '/ikiwiki.da.cgi', # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode => '00755', # rcs backend to use @@ -33,9 +51,9 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_da', + templatedir => 'templates_da', # base wiki source location - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_da', + underlaydir => 'basewiki_da', # display verbose messages when building? #verbose => 1, # log to syslog? @@ -67,7 +85,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 @@ -87,7 +105,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 @@ -127,9 +145,9 @@ 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-da', + #historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]];hb=master-da', # 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 diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 3e19323..584ff64 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.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 $webdir; +our $cgidir; +our $gitdir; +our $webhost; +our $githost; +our $gitrepo; +BEGIN { + $libdir = $ENV{'PWD'} . '/perl'; + $webdir = 'build/html'; + $cgidir = 'build/cgi'; + $gitdir = 'build/git'; + $webhost = '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_nb', + srcdir => 'content_nb', # where to build the wiki - destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org', + destdir => $webdir, # base url to the wiki - url => 'http://wiki.example.org', + url => 'http://' . $webhost . '/', # url to the ikiwiki.cgi - cgiurl => 'http://wiki.example.org/ikiwiki.nb.cgi', + cgiurl => 'http://' . $webhost . '/ikiwiki.nb.cgi', # cgi wrapper to generate - cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.nb.cgi', + cgi_wrapper => $cgidir . '/ikiwiki.nb.cgi', # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode => '00755', # rcs backend to use @@ -33,9 +51,9 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nb', + templatedir => 'templates_nb', # base wiki source location - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nb', + underlaydir => 'basewiki_nb', # display verbose messages when building? #verbose => 1, # log to syslog? @@ -67,7 +85,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 @@ -87,7 +105,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 @@ -127,9 +145,9 @@ 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-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 From 132b82d9930558f4d9b7f5b469cc58b55ea32656 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 31 Aug 2010 16:55:43 +0200 Subject: Fix use qw{} in add_plugins and disable_plugins. --- ikiwiki_da.setup | 6 ++++-- ikiwiki_nb.setup | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 4d3cb25..1e872c3 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -47,9 +47,11 @@ use IkiWiki::Setup::Standard { # rcs backend to use rcs => '', # plugins to add to the default configuration - add_plugins => [], + add_plugins => [qw{ + }], # plugins to disable - disable_plugins => [], + disable_plugins => [qw{ + }], # location of template files templatedir => 'templates_da', # base wiki source location diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 584ff64..bf8247c 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -47,9 +47,11 @@ use IkiWiki::Setup::Standard { # rcs backend to use rcs => '', # plugins to add to the default configuration - add_plugins => [], + add_plugins => [qw{ + }], # plugins to disable - disable_plugins => [], + disable_plugins => [qw{ + }], # location of template files templatedir => 'templates_nb', # base wiki source location -- cgit v1.2.3 From bdc057f3edc154091d8eeec4bedddf230500d170 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 31 Aug 2010 16:58:15 +0200 Subject: Fix generalize gitrepo in ikiwiki setup file. --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index faaeacb..0193f6f 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -147,9 +147,9 @@ 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://' . $githost . '/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master + #historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]]', # ;hb=master # gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted) - #diffurl => 'http://' . $githost . '/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