#
#
# patch "gen-wrapper.sh"
#  from [ad68a7b129ceb422f657c385defb7767c5a442f1]
#    to [3ca843dc04875963d9947f33c44884ff5c0c05a0]
# 
# patch "ikiwiki.setup"
#  from [35e0ff8e106ed0a842508fac4fd2a461c53ae69b]
#    to [04c27065de784226df4da6d9ac13a86f513b4abe]
#
============================================================
--- gen-wrapper.sh	ad68a7b129ceb422f657c385defb7767c5a442f1
+++ gen-wrapper.sh	3ca843dc04875963d9947f33c44884ff5c0c05a0
@@ -3,6 +3,5 @@ echo "> generating ikiwiki wrapper"
 set -e
 
 echo "> generating ikiwiki wrapper"
-ikiwiki --setup ikiwiki.setup --cgi 1 --wrappermode 06755 \
-    --wrapper cgi-bin/ikiwiki.cgi
+ikiwiki --setup ikiwiki.setup --wrappers
 echo "done"
============================================================
--- ikiwiki.setup	35e0ff8e106ed0a842508fac4fd2a461c53ae69b
+++ ikiwiki.setup	04c27065de784226df4da6d9ac13a86f513b4abe
@@ -11,11 +11,14 @@ use IkiWiki::Setup::Standard {
 	adminuser => ['tommyd', ],
 	adminemail => 'address@hidden',
 
+	cgi_wrapper => getcwd . "/cgi-bin/ikiwiki.cgi",
+	wrappermode => "06755",
+    
 	# Be sure to customise these..
 	srcdir => getcwd . "/wiki",
 	destdir => getcwd . "/compiled",
 
-	url => "http://wiki.monotone.ca/",
+	url => "http://wiki.monotone.ca",
 	cgiurl => "http://wiki.monotone.ca/cgi-bin/ikiwiki.cgi",
 	underlaydir => getcwd . "/underlay",
 	userdir => "People",