Merge branch 'master' into _nb

Conflicts (manually resolved):
	ikiwiki_nb.setup

1 files changed, 17 insertions, 25 deletions

diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index d8010b9..ce56998 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.setup
@@ -6,20 +6,12 @@
 #
 # 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;
+our ($basedir, $builddir, $domain, $gitrepo);
 BEGIN {
-	$libdir = $ENV{'PWD'} . '/perl';
-	$webdir = 'build/html';
-	$cgidir = 'build/cgi';
-	$gitdir = 'build/git';
-	$webhost = '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';
 }
 
@@ -27,21 +19,21 @@ use IkiWiki::Setup::Standard {
 	# name of the wiki
 	wikiname => 'MyWiki',
 	# contact email for wiki
-	#adminemail => 'me@example.org',
+	#adminemail => 'me@' . $domain,
 	# users who are wiki admins
 	adminuser => [],
 	# users who are banned from the wiki
 	banned_users => [],
 	# where the source of the wiki is located
-	srcdir => 'content',
+	srcdir => $basedir . '/content',
 	# where to build the wiki
-	destdir => $webdir,
+	destdir => $builddir . '/html',
 	# base url to the wiki
-	url => 'http://' . $webhost . '/',
+	url => 'http://wiki.' . $domain . '/',
 	# url to the ikiwiki.cgi
-	cgiurl => 'http://' . $webhost . '/ikiwiki.cgi',
+	cgiurl => 'http://wiki.' . $domain . '/ikiwiki.cgi',
 	# cgi wrapper to generate
-	cgi_wrapper => $cgidir . '/ikiwiki.cgi',
+	cgi_wrapper => $builddir . '/cgi/ikiwiki.cgi',
 	# mode for cgi_wrapper (can safely be made suid)
 	cgi_wrappermode => '00755',
 	# rcs backend to use
@@ -53,9 +45,9 @@ use IkiWiki::Setup::Standard {
 	disable_plugins => [qw{
 		}],
 	# location of template files
-	templatedir => 'templates',
+	templatedir => $basedir . '/templates',
 	# base wiki source location
-	underlaydir => 'basewiki',
+	underlaydir => $basedir . '/basewiki',
 	# display verbose messages when building?
 	#verbose => 1,
 	# log to syslog?
@@ -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',
+	git_wrapper => $builddir . '/git/post-update-ikiwiki-nb',
 	# 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
+	#historyurl => 'http://source.' . $domain . '/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=' . $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