X-Git-Url: https://git.cworth.org/git?p=cworth.org;a=blobdiff_plain;f=ikiwiki.setup;h=801cf20fa00d4b9f608b957ca03cbd4cd390e998;hp=75d300dcea4d38231128f8dbe9e3f5af40fe6714;hb=3a483098727cfacd72fa877169985a20c68945ad;hpb=97b0c138a965bb66017bf2ce6e681571eb746252

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 75d300d..801cf20 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 = '/home/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",
-	destdir => "/srv/cworth.org/www",
+	srcdir => "$checkout/src",
+	destdir => "/home/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,
@@ -75,10 +82,10 @@ use IkiWiki::Setup::Standard {
 	# To add plugins, list them here.
 	#add_plugins => [qw{goodstuff search wikitext camelcase
 	#                   htmltidy fortune sidebar map rst anonok}],
-	add_plugins => [qw{goodstuff}],
+	add_plugins => [qw{goodstuff pagetemplate rawhtml}],
 	# If you want to disable any of the default plugins, list them here.
 	#disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
-	disable_plugins => [qw{smiley}],
+	disable_plugins => [qw{smiley htmlscrubber}],
 
 	# For use with the tag plugin, make all tags be located under a
 	# base page.