diff options
| -rw-r--r-- | ikiwiki.setup | 44 | ||||
| -rw-r--r-- | ikiwiki_da.setup | 2 | ||||
| -rw-r--r-- | ikiwiki_nb.setup | 2 |
3 files changed, 33 insertions, 15 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup index d0d2f34..6a18fa4 100644 --- a/ikiwiki.setup +++ b/ikiwiki.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_dummy', + srcdir => 'content_dummy', # 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.en.cgi', + cgiurl => 'http://' . $webhost . '/ikiwiki.en.cgi', # cgi wrapper to generate - cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.en.cgi', + cgi_wrapper => $cgidir . '/ikiwiki.en.cgi', # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode => '00755', # rcs backend to use @@ -36,12 +54,12 @@ use IkiWiki::Setup::Standard { editpage }], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates', + templatedir => 'templates', # base wiki source location underlaydirs => [ - $ENV{'HOME'} . "/private_webdata/samplewiki/content", + 'content', ], - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki', + underlaydir => 'basewiki', # display verbose messages when building? #verbose => 1, # log to syslog? @@ -73,7 +91,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 @@ -93,7 +111,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 @@ -129,13 +147,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', + git_wrapper => $gitdir . '/post-update-ikiwiki', # 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://' . $githost . '/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master # 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=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 diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 29a8485..cfdf2b4 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -128,7 +128,7 @@ 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-da', + git_wrapper => $gitdir . '/post-update-ikiwiki-da', # mode for git_wrapper (can safely be made suid) git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 5364fc7..46128ac 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -128,7 +128,7 @@ 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', + git_wrapper => $gitdir . '/post-update-ikiwiki-nb', # mode for git_wrapper (can safely be made suid) git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) |