diff options
| -rw-r--r-- | ikiwiki_nb_admin.setup | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/ikiwiki_nb_admin.setup b/ikiwiki_nb_admin.setup index c895e8d..3944432 100644 --- a/ikiwiki_nb_admin.setup +++ b/ikiwiki_nb_admin.setup @@ -6,20 +6,12 @@ # # 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; +our ($basedir, $builddir, $domain, $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'; + # git hook requires full path as basedir: $ENV{'HOME'} . '/mywiki' + $basedir = $ENV{'PWD'}; + $builddir = $ENV{'BUILDDIR'} || $basedir . '/build'; + $domain = 'example.org'; $gitrepo = 'wiki'; } @@ -35,13 +27,13 @@ use IkiWiki::Setup::Standard { # where the source of the wiki is located srcdir => 'content', # where to build the wiki - destdir => $adminwebdir, + destdir => $builddir . '/html-admin', # base url to the wiki - url => 'http://' . $adminwebhost . '/', + url => 'http://admin.' . $domain . '/', # url to the ikiwiki.cgi - cgiurl => 'http://' . $adminwebhost . '/ikiwiki.cgi', + cgiurl => 'http://admin.' . $domain . '/ikiwiki.cgi', # cgi wrapper to generate - cgi_wrapper => $admincgidir . '/ikiwiki.cgi', + cgi_wrapper => $builddir . '/cgi-admin/ikiwiki.cgi', # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode => '00755', # rcs backend to use @@ -87,7 +79,7 @@ use IkiWiki::Setup::Standard { # force ikiwiki to use a particular umask #umask => 022, # extra library and plugin directory - libdir => $libdir, + libdir => $basedir . '/perl', # environment variables ENV => {}, # regexp of source files to ignore @@ -143,13 +135,13 @@ use IkiWiki::Setup::Standard { # git plugin # git hook to generate - git_wrapper => $gitdir . '/post-update-ikiwiki-nb-admin', + git_wrapper => $builddir . '/git/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://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]];hb=master-nb', + historyurl => 'http://source.' . $domain . '/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://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]', + diffurl => 'http://source.' . $domain . '/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 |