ikiwiki.setup: Align to latest upstream changes.

1 files changed, 50 insertions, 4 deletions

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 872249c6..aee01480 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -47,7 +47,7 @@ IkiWiki::Setup::Standard->import({
 	url => 'http://www.bddebian.com:8888/~hurd-web',
 	# url to the ikiwiki.cgi
 	cgiurl => 'http://www.bddebian.com:8888/cgi-bin/hurd-web-ikiwiki.cgi',
-	# cgi wrapper to generate
+	# filename of cgi wrapper to generate
 	cgi_wrapper => $cgi_wrapper,
 	# mode for cgi_wrapper (can safely be made suid)
 	cgi_wrappermode => '06755',
@@ -61,7 +61,7 @@ IkiWiki::Setup::Standard->import({
 	templatedir => $srcdir.'/.templates',
 	# base wiki source location
 	#underlaydir => '/usr/share/ikiwiki/basewiki',
-	# display verbose messages when building?
+	# display verbose messages?
 	verbose => 1,
 	# log to syslog?
 	syslog => 0,
@@ -91,6 +91,8 @@ IkiWiki::Setup::Standard->import({
 	hardlink => 1,
 	# force ikiwiki to use a particular umask
 	#umask => 022,
+	# group for wrappers to run in
+	#wrappergroup => 'ikiwiki',
 	# extra library and plugin directory
 	libdir => $srcdir.'/.library',
 	# environment variables
@@ -113,7 +115,7 @@ IkiWiki::Setup::Standard->import({
 	#untrusted_committers => [],
 	# gitweb url to show file history ([[file]] substituted)
 	historyurl => 'http://www.bddebian.com:8888/gitweb/?p=hurd-web;a=history;f=[[file]]',
-	# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], [[sha1_commit]] and [[file]] substituted)
+	# gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)
 	diffurl => 'http://www.bddebian.com:8888/gitweb/?p=hurd-web;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
 	# where to pull and push changes (set to empty string to disable)
 	gitorigin_branch => $gitorigin_branch,
@@ -122,7 +124,7 @@ IkiWiki::Setup::Standard->import({
 
 	# aggregate plugin
 	# enable aggregation to internal pages?
-	#aggregateinternal => 0,
+	#aggregateinternal => 1,
 	# allow aggregation to be triggered via the web?
 	#aggregate_webtrigger => 0,
 
@@ -136,6 +138,14 @@ IkiWiki::Setup::Standard->import({
 	# virus checker program (reads STDIN, returns nonzero if virus found)
 	#virus_checker => 'clamdscan -',
 
+	# blogspam plugin
+	# PageSpec of pages to check for spam
+	#blogspam_pagespec => 'postcomment(*)',
+	# options to send to blogspam server
+	#blogspam_options => 'blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10',
+	# blogspam server XML-RPC url
+	#blogspam_server => '',
+
 	# bzr plugin
 	# bzr post-commit hook to generate
 	#bzr_wrapper => '',
@@ -150,6 +160,34 @@ IkiWiki::Setup::Standard->import({
 	# base of the archives hierarchy
 	#archivebase => 'archives',
 
+	# camelcase plugin
+	# list of words to not turn into links
+	#camelcase_ignore => [],
+
+	# comments plugin
+	# PageSpec of pages where comments are allowed
+	#comments_pagespec => 'blog/* and !*/Discussion',
+	# PageSpec of pages where posting new comments is not allowed
+	#comments_closed_pagespec => 'blog/controversial or blog/flamewar',
+	# Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"
+	#comments_pagename => '',
+	# Interpret directives in comments?
+	#comments_allowdirectives => 0,
+	# Allow anonymous commenters to set an author name?
+	#comments_allowauthor => 0,
+	# commit comments to the VCS
+	#comments_commit => 1,
+
+	# darcs plugin
+	# wrapper to generate (set as master repo apply hook)
+	#darcs_wrapper => '/darcs/repo/_darcs/ikiwiki-wrapper',
+	# mode for darcs_wrapper (can safely be made suid)
+	#darcs_wrappermode => '06755',
+	# darcsweb url to show file history ([[file]] substituted)
+	#historyurl => 'http://darcs.example.com/darcsweb.cgi?r=wiki;a=filehistory;f=[[file]]',
+	# darcsweb url to show a diff ([[hash]] and [[file]] substituted)
+	#diffurl => 'http://darcs.example.com/darcsweb.cgi?r=wiki;a=filediff;h=[[hash]];f=[[file]]',
+
 	# htmlscrubber plugin
 	# PageSpec specifying pages not to scrub
 	#htmlscrubber_skip => '!*/Discussion',
@@ -216,6 +254,10 @@ IkiWiki::Setup::Standard->import({
 	# number of changes to track
 	recentchangesnum => 100,
 
+	# repolist plugin
+	# URIs of repositories containing the wiki's source
+	#repositories => [qw{svn://svn.example.org/wiki/trunk}],
+
 	# search plugin
 	# path to the omega cgi program
 	#omega_cgi => '/usr/lib/cgi-bin/omega/omega',
@@ -262,6 +304,10 @@ IkiWiki::Setup::Standard->import({
 	# url to show a diff ([[file]] and [[rev]] substituted)
 	#diffurl => '',
 
+	# underlay plugin
+	# extra underlay directories to add
+	#add_underlays => '',
+
 	# websetup plugin
 	# list of plugins that cannot be enabled/disabled via the web interface
 	#websetup_force_plugins => [],