Update ikiwiki.setup according to latest model in ikiwiki-bootstrap

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 75d300dcea4d38231128f8dbe9e3f5af40fe6714..cbc275f8ca665efe7621a4f32c853f19375addf2 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -5,18 +5,25 @@
 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
+our ($gitrepo, $checkout);
+
+BEGIN {
+       $gitrepo = '/srv/cworth.org/wiki';
+       $checkout = "$gitrepo/ikiwiki-checkout";
+}
+
 use IkiWiki::Setup::Standard {
        wikiname => "Carl's boring web pages",
        #adminuser => ["yourname", ],
        adminemail => 'cworth@cworth.org',
 
        # Be sure to customise these..
-       srcdir => "/srv/cworth.org/wiki/checkout/src",
+       srcdir => "$checkout/src",
        destdir => "/srv/cworth.org/www",
 
        url => "http://cworth.org",
        #cgiurl => "http://example.org/ikiwiki.cgi",
-       templatedir => "/srv/cworth.org/wiki/checkout/templates",
+       templatedir => "$checkout/templates",
        underlaydir => "/dev/null",
 
        # Git stuff.
@@ -38,7 +45,7 @@ use IkiWiki::Setup::Standard {
                        # Note that this will overwrite any existing
                        # post-update hook script, which may not be
                        # what you want.
-                       wrapper => "/srv/cworth.org/wiki/hooks/ikiwiki-post-update",
+                       wrapper => "$gitrepo/hooks/ikiwiki-post-update",
                        wrappermode => "04755",
                        # Enable mail notifications of commits.
                        #notify => 1,