X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=ikiwiki.setup;h=91199a5508b6ca440a160aebaa77d036e1047829;hb=13aa2ef58cfe29ee421fa7c3598371562d99a470;hp=1159b521cf9c075201a553284725f545adb9cc6a;hpb=44501662f116639167e4b6d94430f3a2cae213c4;p=ikiwiki-bootstrap

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 1159b52..91199a5 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -27,8 +27,12 @@
 # Also, see the destdir and url parameters below which must also be
 # configured before things will work at all.
 
-my gitrepo = '/path/to/bare/git/repo';
-my checkout = "$gitrepo/ikiwiki-checkout";
+our ($gitrepo, $checkout);
+
+BEGIN {
+	$gitrepo = '/path/to/bare/git/repo';
+	$checkout = "$gitrepo/ikiwiki-checkout";
+}
 
 use IkiWiki::Setup::Standard {
 
@@ -44,9 +48,19 @@ use IkiWiki::Setup::Standard {
 	adminemail => 'me@example.org',
 
 	# Everything else can be customised on an as-needed basis
-	srcdir => "$checkout/src";
+	srcdir => "$checkout/src",
 	templatedir => "$checkout/templates",
-	underlaydir => "$checkout/underlay";
+
+	# There's not really much point to having an underlay come
+	# from the same place as the rest of the source like this:
+	#
+	#	underlaydir => "$checkout/underlay",
+	#
+	# since you might as well put such content in src/ instead of
+	# in underlay. I suppose if you have some files common to
+	# several separate wiki instances then the underlay might
+	# still be useful. But for now, we'll just leave it off.
+	underlaydir = "/dev/null",
 
 	# Git stuff.
 	rcs => "git",
@@ -66,7 +80,7 @@ use IkiWiki::Setup::Standard {
 			# Instead of overwriting git's post-update script
 		        # we generate a new program that can be called by
 		        # post-update as desired.
-			wrapper => "$gitrepo/hooks/post-update",
+			wrapper => "$gitrepo/hooks/ikiwiki-post-update",
 			wrappermode => "04755",
 			# Enable mail notifications of commits.
 			#notify => 1,