commit of setup files

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 5d278f83a9e690bec7307a5f6d262e0c15ede52d..d03c8071a0e527d5aa58714f5bb1e82abe4b00d2 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -24,8 +24,6 @@ destdir: /home/b-charles-plessy-org/public_html
 url: http://charles.plessy.org
 # url to the ikiwiki.cgi
 cgiurl: http://charles.plessy.org/ikiwiki.cgi
-# do not adjust cgiurl if CGI is accessed via different URL
-#reverse_proxy: ''
 # filename of cgi wrapper to generate
 cgi_wrapper: /var/www/b-charles-plessy-org/ikiwiki.cgi
 # mode for cgi_wrapper (can safely be made suid)
@@ -63,7 +61,6 @@ add_plugins:
 - version
 - theme
 - po
-- html
 # plugins to disable
 disable_plugins: []
 # additional directory to search for template files
@@ -123,13 +120,11 @@ allow_symlinks_before_srcdir: 0
 # cookie control
 cookiejar:
   file: /home/b-charles-plessy-org/.ikiwiki/cookies
-# set custom user agent string for outbound HTTP requests e.g. when fetching aggregated RSS feeds
-#useragent: Wget/1.13.4 (linux-gnu)
 
 ######################################################################
 # core plugins
 #   (branchable, editpage, git, gitpush, htmlscrubber, ikiwikihosting,
-#    inline, link, meta, parentlinks, templatebody)
+#    inline, link, meta, parentlinks)
 ######################################################################
 
 # branchable plugin
@@ -307,8 +302,8 @@ po_link_to: negotiated
 
 ######################################################################
 # web plugins
-#   (404, attachment, comments, editdiff, edittemplate, google, goto,
-#    mirrorlist, remove, rename, repolist, search, theme, userlist,
+#   (404, attachment, comments, editdiff, edittemplate, getsource, google,
+#    goto, mirrorlist, remove, rename, repolist, search, theme, userlist,
 #    websetup, wmd)
 ######################################################################
 
@@ -332,7 +327,11 @@ comments_pagename: comment_
 # commit comments to the VCS
 comments_commit: 1
 # Restrict formats for comments to (no restriction if empty)
-comments_allowformats: ''
+#comments_allowformats: mdwn txt
+
+# getsource plugin
+# Mime type for returned source.
+#getsource_mimetype: text/plain; charset=utf-8
 
 # mirrorlist plugin
 # list of mirrors
@@ -350,7 +349,7 @@ repositories:
 # path to the omega cgi program
 omega_cgi: /usr/lib/cgi-bin/omega/omega
 # use google site search rather than internal xapian index?
-google_search: 0
+google_search: 1
 
 # theme plugin
 # name of theme to enable