X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=ikiwiki.setup;h=887f256815ca56e908b82aea12a1af3b7c7527d7;hb=233c98c119163220e547c03bc463aa1d507a513f;hp=d006f8cfb6e290c29de06f2ffda3fbc564394229;hpb=75a985002c9cd2833fa32ae6ef97206d72b5ab96;p=cworth.org

diff --git a/ikiwiki.setup b/ikiwiki.setup
index d006f8c..887f256 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -6,7 +6,7 @@
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
 use IkiWiki::Setup::Standard {
-	wikiname => "cworth.org",
+	wikiname => "Carl's boring web pages",
 	#adminuser => ["yourname", ],
 	adminemail => 'cworth@cworth.org',
 
@@ -16,15 +16,15 @@ use IkiWiki::Setup::Standard {
 
 	url => "http://cworth.org",
 	#cgiurl => "http://example.org/ikiwiki.cgi",
-	#templatedir => "/usr/share/ikiwiki/templates",
+	templatedir => "/srv/cworth.org/wiki/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 +33,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 => "/srv/cworth.org/wiki/hooks/ikiwiki-post-update",
+			wrappermode => "04755",
+			# Enable mail notifications of commits.
+			#notify => 1,
+		},
 	],
 
 	# Generate rss feeds for blogs?
@@ -75,12 +75,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}],
 	# If you want to disable any of the default plugins, list them here.
 	#disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
+	disable_plugins => [qw{smiley}],
 
 	# 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.