commit of setup files

diff --git a/ikiwiki.setup b/ikiwiki.setup
index edc1f1fbb4cd3fbe0132d75fcd6c939105cd1987..d03c8071a0e527d5aa58714f5bb1e82abe4b00d2 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -13,7 +13,7 @@ wikiname: Chez Charles
 adminemail: webmaster@plessy.org
 # users who are wiki admins
 adminuser:
-  - https://launchpad.net/~plessy
+- https://launchpad.net/~plessy
 # users who are banned from the wiki
 banned_users: []
 # where the source of the wiki is located
@@ -28,33 +28,39 @@ cgiurl: http://charles.plessy.org/ikiwiki.cgi
 cgi_wrapper: /var/www/b-charles-plessy-org/ikiwiki.cgi
 # mode for cgi_wrapper (can safely be made suid)
 cgi_wrappermode: 0755
+# number of seconds to delay CGI requests when overloaded
+cgi_overload_delay: ''
+# message to display when overloaded (may contain html)
+cgi_overload_message: ''
+# enable optimization of only refreshing committed changes?
+only_committed_changes: 0
 # rcs backend to use
 rcs: git
 # plugins to add to the default configuration
 add_plugins:
-  - goodstuff
-  - websetup
-  - 404
-  - ikiwikihosting
-  - branchable
-  - recentchangesdiff
-  - attachment
-  - remove
-  - rename
-  - edittemplate
-  - favicon
-  - format
-  - fortune
-  - highlight
-  - listdirectives
-  - poll
-  - progress
-  - relativedate
-  - search
-  - testpagespec
-  - version
-  - theme
-  - po
+- goodstuff
+- websetup
+- 404
+- ikiwikihosting
+- branchable
+- recentchangesdiff
+- attachment
+- remove
+- rename
+- edittemplate
+- favicon
+- format
+- fortune
+- highlight
+- listdirectives
+- poll
+- progress
+- relativedate
+- search
+- testpagespec
+- version
+- theme
+- po
 # plugins to disable
 disable_plugins: []
 # additional directory to search for template files
@@ -93,8 +99,8 @@ userdir: ''
 numbacklinks: 10
 # attempt to hardlink source files? (optimisation for large files)
 hardlink: 1
-# force ikiwiki to use a particular umask
-#umask: 022
+# force ikiwiki to use a particular umask (keywords public, group or private, or a number)
+#umask: public
 # group for wrappers to run in
 #wrappergroup: ikiwiki
 # extra library and plugin directory
@@ -104,13 +110,16 @@ ENV: {}
 # time zone name
 timezone: GMT
 # regexp of normally excluded files to include
-#include: '^\.htaccess$'
+#include: ^\.htaccess$
 # regexp of files that should be skipped
-#exclude: '^(*\.private|Makefile)$'
+#exclude: ^(*\.private|Makefile)$
 # specifies the characters that are allowed in source filenames
-wiki_file_chars: '-[:alnum:]+/.:_'
+wiki_file_chars: -[:alnum:]+/.:_
 # allow symlinks in the path leading to the srcdir (potentially insecure)
 allow_symlinks_before_srcdir: 0
+# cookie control
+cookiejar:
+  file: /home/b-charles-plessy-org/.ikiwiki/cookies
 
 ######################################################################
 # core plugins
@@ -137,11 +146,11 @@ git_wrapper: /home/b-charles-plessy-org/source.git/hooks/post-update
 #git_test_receive_wrapper: /git/wiki.git/hooks/pre-receive
 # unix users whose commits should be checked by the pre-receive hook
 untrusted_committers:
-  - ikiwiki-anon
+- ikiwiki-anon
 # gitweb url to show file history ([[file]] substituted)
-historyurl: 'http://source.charles-plessy-org.branchable.com/?p=source.git;a=history;f=[[file]];hb=HEAD'
+historyurl: http://source.charles-plessy-org.branchable.com/?p=source.git;a=history;f=[[file]];hb=HEAD
 # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)
-diffurl: 'http://source.charles-plessy-org.branchable.com/?p=source.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]'
+diffurl: http://source.charles-plessy-org.branchable.com/?p=source.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]
 # where to pull and push changes (set to empty string to disable)
 gitorigin_branch: origin
 # branch that the wiki is stored in
@@ -158,9 +167,9 @@ htmlscrubber_skip: '*'
 # ikiwikihosting plugin
 # list of urls that alias to the main url
 urlalias:
-  - http://charles-plessy-org.branchable.com/
-  - http://charles-plessy-org.branchable.com/
-  - http://www.charles.plessy.org/
+- http://charles-plessy-org.branchable.com/
+- http://charles-plessy-org.branchable.com/
+- http://www.charles.plessy.org/
 # openid of primary site owner
 owner: https://launchpad.net/~plessy
 # optional hostname of site this one was branched from
@@ -200,7 +209,7 @@ pingurl: []
 # 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_options: blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10
 # blogspam server XML-RPC url
 #blogspam_server: ''
 
@@ -247,23 +256,50 @@ langdefdir: /usr/share/highlight/langDefs
 # mdwn plugin
 # enable multimarkdown features?
 #multimarkdown: 0
+# disable use of markdown discount?
+#nodiscount: 0
 
 # po plugin
 # master language (non-PO files)
 po_master_language: fr|French
 # slave languages (translated via PO files) format: ll|Langname
 po_slave_languages:
-  - en|English
+- en|English
 # PageSpec controlling which pages are translatable
-po_translatable_pages: '* and !*/Discussion and !shortcuts and !Japon/kanji/* and !biblio/* and !tags/*'
+po_translatable_pages: '* and !*/Discussion and !shortcuts and !Japon/kanji/* and
+  !biblio/* and !tags/*'
 # internal linking behavior (default/current/negotiated)
 po_link_to: negotiated
 
 ######################################################################
-# misc plugins
-#   (filecheck)
+# special-purpose plugins
+#   (osm, underlay)
 ######################################################################
 
+# osm plugin
+# the default zoom when you click on the map link
+#osm_default_zoom: 15
+# the icon shown on links and on the main map
+#osm_default_icon: ikiwiki/images/osm.png
+# the alt tag of links, defaults to empty
+#osm_alt: ''
+# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+#osm_format: KML
+# the icon attached to a tag, displayed on the map for tagged pages
+#osm_tag_default_icon: icon.png
+# Url for the OpenLayers.js file
+#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js
+# Layers to use in the map. Can be either the 'OSM' string or a type option for Google maps (GoogleNormal, GoogleSatellite, GoogleHybrid or GooglePhysical). It can also be an arbitrary URL in a syntax acceptable for OpenLayers.Layer.OSM.url parameter.
+#osm_layers:
+#  OSM: GoogleSatellite
+# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+#osm_google_apikey: ''
+
+# underlay plugin
+# extra underlay directories to add
+#add_underlays:
+#- /home/b-charles-plessy-org/wiki.underlay
+
 ######################################################################
 # web plugins
 #   (404, attachment, comments, editdiff, edittemplate, getsource, google,
@@ -290,6 +326,8 @@ comments_pagename: comment_
 #comments_allowauthor: 0
 # 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.
@@ -298,16 +336,20 @@ comments_commit: 1
 # mirrorlist plugin
 # list of mirrors
 #mirrorlist: {}
+# generate links that point to the mirrors' ikiwiki CGI
+#mirrorlist_use_cgi: 1
 
 # repolist plugin
 # URIs of repositories containing the wiki's source
 repositories:
-  - ssh://b-charles-plessy-org@charles-plessy-org.branchable.com/
-  - git://charles-plessy-org.branchable.com/
+- ssh://b-charles-plessy-org@charles-plessy-org.branchable.com/
+- git://charles-plessy-org.branchable.com/
 
 # search plugin
 # 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
 
 # theme plugin
 # name of theme to enable
@@ -316,21 +358,21 @@ omega_cgi: /usr/lib/cgi-bin/omega/omega
 # websetup plugin
 # list of plugins that cannot be enabled/disabled via the web interface
 websetup_force_plugins:
-  - httpauth
-  - openid
-  - mdwn
-  - wmd
+- httpauth
+- openid
+- mdwn
+- wmd
 # list of additional setup field keys to treat as unsafe
 websetup_unsafe:
-  - url
-  - cgiurl
-  - verbose
-  - syslog
-  - usedirs
-  - prefix_directives
-  - indexpages
-  - repositories
-  - sslcookie
+- url
+- cgiurl
+- verbose
+- syslog
+- usedirs
+- prefix_directives
+- indexpages
+- repositories
+- sslcookie
 # show unsafe settings, read-only, in web interface?
 websetup_show_unsafe: 0
 
@@ -357,24 +399,31 @@ directive_description_dir: ikiwiki/directive
 # Should teximg use dvipng to render, or dvips and convert?
 #teximg_dvipng: ''
 # LaTeX prefix for teximg plugin
-#teximg_prefix: |
-#  \documentclass{article}
+#teximg_prefix: '\documentclass{article}
+#
 #  \usepackage[utf8]{inputenc}
+#
 #  \usepackage{amsmath}
+#
 #  \usepackage{amsfonts}
+#
 #  \usepackage{amssymb}
+#
 #  \pagestyle{empty}
+#
 #  \begin{document}
+#
+#'
 # LaTeX postfix for teximg plugin
-#teximg_postfix: '\end{document}'
+#teximg_postfix: \end{document}
 
 ######################################################################
 # other plugins
 #   (aggregate, autoindex, brokenlinks, camelcase, ddate, embed, favicon,
-#    flattr, goodstuff, htmlbalance, localstyle, missingsite, pagetemplate,
-#    parked, pingee, pinger, prettydate, recentchanges, recentchangesdiff,
-#    relativedate, rsync, sidebar, smiley, sortnaturally, tag,
-#    testpagespec, transient, typography, underlay)
+#    filecheck, flattr, goodstuff, htmlbalance, localstyle, missingsite,
+#    notifyemail, pagetemplate, parked, pingee, pinger, prettydate,
+#    recentchanges, recentchangesdiff, relativedate, rsync, sidebar,
+#    smiley, sortnaturally, tag, testpagespec, trail, transient, typography)
 ######################################################################
 
 # aggregate plugin
@@ -382,9 +431,6 @@ directive_description_dir: ikiwiki/directive
 aggregateinternal: 1
 # allow aggregation to be triggered via the web?
 #aggregate_webtrigger: 0
-# cookie control
-cookiejar:
-  file: /home/b-charles-plessy-org/.ikiwiki/cookies
 
 # autoindex plugin
 # commit autocreated index pages
@@ -435,8 +481,3 @@ tag_autocreate_commit: 1
 # typography plugin
 # Text::Typography attributes value
 #typographyattributes: 3
-
-# underlay plugin
-# extra underlay directories to add
-#add_underlays:
-#  - /home/b-charles-plessy-org/wiki.underlay