Turn off underlaydir to avoid errors

[ikiwiki-bootstrap] / ikiwiki.setup

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 1159b521cf9c075201a553284725f545adb9cc6a..91199a5508b6ca440a160aebaa77d036e1047829 100644 (file)
--- 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,