X-Git-Url: https://git.cworth.org/git?p=cworth.org;a=blobdiff_plain;f=ikiwiki.setup;h=801cf20fa00d4b9f608b957ca03cbd4cd390e998;hp=42404089678d7ad7faa1fa313582fd9bf3d5bcba;hb=93addf7ab050c5b508f79549e1359770c7116373;hpb=ea837839116d5372ad8db8968c43d3fbd8115b93

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 4240408..801cf20 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -5,26 +5,33 @@
 #
 # 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 => "MyWiki",
+	wikiname => "Carl's boring web pages",
 	#adminuser => ["yourname", ],
-	adminemail => 'me@example.org',
+	adminemail => 'cworth@cworth.org',
 
 	# Be sure to customise these..
-	srcdir => "/path/to/source",
-	destdir => "/var/www/wiki",
+	srcdir => "$checkout/src",
+	destdir => "/home/srv/cworth.org/www",
 
-	url => "http://example.org/wiki",
-	cgiurl => "http://example.org/ikiwiki.cgi",
-	#templatedir => "/usr/share/ikiwiki/templates",
-	#underlaydir => "/usr/share/ikiwiki/basewiki",
+	url => "http://cworth.org",
+	#cgiurl => "http://example.org/ikiwiki.cgi",
+	templatedir => "$checkout/templates",
+	underlaydir => "/dev/null",
 
 	# Git stuff.
-	#rcs => "git",
+	rcs => "git",
 	#historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
 	#diffurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
-	#gitorigin_branch => "origin",
-	#gitmaster_branch => "master",
+	gitorigin_branch => "origin",
+	gitmaster_branch => "master",
 
 	wrappers => [
 		#{
@@ -33,16 +40,16 @@ use IkiWiki::Setup::Standard {
 		#	wrapper => "/var/www/wiki/ikiwiki.cgi",
 		#	wrappermode => "06755",
 		#},
-		#{
-		#	# The git post-update wrapper.
-		#	# Note that this will overwrite any existing
-		#	# post-update hook script, which may not be
-		#	# what you want.
-		#	wrapper => "/git/wiki.git/hooks/post-update",
-		#	wrappermode => "04755",
-		#	# Enable mail notifications of commits.
-		#	notify => 1,
-		#},
+		{
+			# The git post-update wrapper.
+			# Note that this will overwrite any existing
+			# post-update hook script, which may not be
+			# what you want.
+			wrapper => "$gitrepo/hooks/ikiwiki-post-update",
+			wrappermode => "04755",
+			# Enable mail notifications of commits.
+			#notify => 1,
+		},
 	],
 
 	# Generate rss feeds for blogs?
@@ -63,7 +70,7 @@ use IkiWiki::Setup::Standard {
 	# Only send cookies over SSL connections.
 	#sslcookie => 1,
 	# Logging settings:
-	verbose => 0,
+	# verbose => 0,
 	syslog => 0,
 	# To link to user pages in a subdirectory of the wiki.
 	#userdir => "users",
@@ -75,12 +82,14 @@ 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 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 htmlscrubber}],
 
 	# For use with the tag plugin, make all tags be located under a
 	# base page.
-	#tagbase => "tag",
+	tagbase => "tag",
 
 	# For use with the search plugin if your estseek.cgi is located
 	# somewhere else.