commit of setup files

diff --git a/ikiwiki.setup b/ikiwiki.setup
index d03c8071a0e527d5aa58714f5bb1e82abe4b00d2..c0264121ac1ee98fb79f058ad0d6717ee82a08f2 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -24,6 +24,8 @@ 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: 0
 # 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)
@@ -61,6 +63,7 @@ add_plugins:
 - version
 - theme
 - po
+- html
 # plugins to disable
 disable_plugins: []
 # additional directory to search for template files
@@ -106,7 +109,7 @@ hardlink: 1
 # extra library and plugin directory
 libdir: /home/b-charles-plessy-org/.ikiwiki
 # environment variables
-ENV: {}
+#ENV: ''
 # time zone name
 timezone: GMT
 # regexp of normally excluded files to include
@@ -120,11 +123,13 @@ 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: ikiwiki/3.20141017
 
 ######################################################################
 # core plugins
 #   (branchable, editpage, git, gitpush, htmlscrubber, ikiwikihosting,
-#    inline, link, meta, parentlinks)
+#    inline, link, meta, parentlinks, templatebody)
 ######################################################################
 
 # branchable plugin
@@ -267,7 +272,7 @@ po_slave_languages:
 - en|English
 # PageSpec controlling which pages are translatable
 po_translatable_pages: '* and !*/Discussion and !shortcuts and !Japon/kanji/* and
-  !biblio/* and !tags/*'
+  !biblio/* and !tags/* and !Haskell/*'
 # internal linking behavior (default/current/negotiated)
 po_link_to: negotiated
 
@@ -302,8 +307,8 @@ po_link_to: negotiated
 
 ######################################################################
 # web plugins
-#   (404, attachment, comments, editdiff, edittemplate, getsource, google,
-#    goto, mirrorlist, remove, rename, repolist, search, theme, userlist,
+#   (404, attachment, comments, editdiff, edittemplate, google, goto,
+#    mirrorlist, remove, rename, repolist, search, theme, userlist,
 #    websetup, wmd)
 ######################################################################
 
@@ -327,11 +332,7 @@ comments_pagename: comment_
 # commit comments to the VCS
 comments_commit: 1
 # Restrict formats for comments to (no restriction if empty)
-#comments_allowformats: mdwn txt
-
-# getsource plugin
-# Mime type for returned source.
-#getsource_mimetype: text/plain; charset=utf-8
+comments_allowformats: ''
 
 # mirrorlist plugin
 # list of mirrors
@@ -349,7 +350,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: 1
+google_search: 0
 
 # theme plugin
 # name of theme to enable