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

diff --git a/ikiwiki.setup b/ikiwiki.setup
index f90a837..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",