X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/12422e98901cef2774b15ec0e6468e88d4d0a6c6..00d761ab53976e8aa53a7e988b74e2681c8accb6:/doc/ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index d6ca7bb0b..4299a64f6 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -16,31 +16,46 @@ use IkiWiki::Setup::Standard {
 	
 	url => "http://myhost/wiki",
 	cgiurl => "http://myhost/ikiwiki.cgi",
-	#historyurl => "http://svn.myhost/trunk/[[file]]",
-	#diffurl => "http://svn.someurl/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
 	#templatedir => "/usr/share/ikiwiki/templates",
 	
-	#rcs => "", # don't use svn
-	rcs => "svn", # use svn (the default)
+	# Subversion stuff.
+	rcs => "svn",
+	#historyurl => "http://svn.myhost/trunk/[[file]]",
+	#diffurl => "http://svn.someurl/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
 	svnrepo => "/svn/wiki",
 	svnpath => "trunk",
 
+	# Git stuff.
+	#rcs => "git",
+	#historyurl => "http://git.host/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
+	#diffurl => "http://git.host/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+
 	wrappers => [
+		#{
+		#	# The cgi wrapper.
+		#	cgi => 1,
+		#	wrapper => "/var/www/wiki/ikiwiki.cgi",
+		#	wrappermode => "06755",
+		#},
 		{
-			# The svn wrapper.
-			# Note that this will overwrite any exsting
+			# The svn post-commit wrapper.
+			# Note that this will overwrite any existing
 			# post-commit hook script, which may not be
 			# what you want.
-			wrapper => "/svn/wiki/hooks/post-commit",
+			wrapper => "/svn/wikirepo/hooks/post-commit",
 			wrappermode => "04755",
 			# Enable mail notifications of commits.
 			notify => 1,
 		},
 		#{
-		#	# The cgi wrapper.
-		#	cgi => 1,
-		#	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/wikirepo/hooks/post-update",
+		#	wrappermode => "04755",
+		#	# Enable mail notifications of commits.
+		#	notify => 1,
 		#},
 	],
 	
@@ -48,10 +63,11 @@ use IkiWiki::Setup::Standard {
 	#anonok => 1,
 	# Generate rss feeds for pages?
 	rss => 1,
-	# Use the Hyper Estraier search engine?
-	#hyperestraier => 1,
-	# Sanitize html?
-	sanitize => 1,
+	# Include discussion links on all pages?
+	discussion => 1,
+	# Time format (for strftime)
+	#timeformat => '%c',
 	# To change the enabled plugins, edit this list
-	#plugin => [qw{pagecount inline brokenlinks}],
+	#plugin => [qw{pagecount inline brokenlinks search smiley
+	#              htmlscrubber}],
 }