From: Carl Worth <cworth@cworth.org>
Date: Fri, 15 Jun 2007 18:40:10 +0000 (-0700)
Subject: Update ikiwiki.setup according to latest model in ikiwiki-bootstrap
X-Git-Url: https://git.cworth.org/git?p=cworth.org;a=commitdiff_plain;h=ff6c9ee26e785c98b90c537d2f167861100470b5

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

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 75d300d..cbc275f 100644
--- 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,