wiki setup changessetup

1 files changed, 71 insertions, 37 deletions

diff --git a/wiki.setup b/wiki.setup
index 29ad217..2ff2630 100644
--- a/wiki.setup
+++ b/wiki.setup
@@ -24,10 +24,18 @@ destdir: /home/dsilvers/websites/gitano.org.uk/wiki/html
 url: https://wiki.gitano.org.uk/
 # url to the ikiwiki.cgi
 cgiurl: https://wiki.gitano.org.uk/cgi-bin/ikiwiki.cgi
+# do not adjust cgiurl if CGI is accessed via different URL
+reverse_proxy: 0
 # filename of cgi wrapper to generate
 cgi_wrapper: /home/dsilvers/websites/gitano.org.uk/wiki/cgi-bin/ikiwiki.cgi
 # mode for cgi_wrapper (can safely be made suid)
 cgi_wrappermode: 06755
+# 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
@@ -59,7 +67,6 @@ disable_plugins:
 - jscalendar
 - archive
 # additional directory to search for template files
-#templatedir: /usr/share/ikiwiki/templates
 templatedir: /home/dsilvers/websites/gitano.org.uk/wiki/ikiwiki-bootstrap-theme
 # base wiki source location
 underlaydir: /usr/share/ikiwiki/basewiki
@@ -77,7 +84,7 @@ indexpages: 0
 discussion: 0
 # name of Discussion pages
 discussionpage: Discussion
-# generate HTML5?
+# use elements new in HTML5 like <section>?
 html5: 1
 # only send cookies over SSL connections?
 sslcookie: 0
@@ -90,7 +97,7 @@ timeformat: '%c'
 # UTF-8 locale to use
 #locale: en_US.UTF-8
 # put user pages below specified page
-userdir: 'users'
+userdir: users
 # how many backlinks to show before hiding excess (0 to show all)
 numbacklinks: 10
 # attempt to hardlink source files? (optimisation for large files)
@@ -99,12 +106,14 @@ hardlink: 0
 #umask: public
 # group for wrappers to run in
 #wrappergroup: ikiwiki
-# extra library and plugin directory
-#libdir: '/home/dsilvers/websites/digital-scurf.org/blog/gresille-ikiwiki/jscalendar'
+# extra library and plugin directories
+libdirs: []
+# extra library and plugin directory (searched after libdirs)
+libdir: ''
 # environment variables
-ENV: {}
+#ENV: ''
 # time zone name
-#timezone: US/Eastern
+timezone: Europe/London
 # regexp of normally excluded files to include
 #include: ^\.htaccess$
 # regexp of files that should be skipped
@@ -113,10 +122,18 @@ ENV: {}
 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/dsilvers/.ikiwiki/cookies
+# set custom user agent string for outbound HTTP requests e.g. when fetching aggregated RSS feeds
+useragent: ikiwiki/3.20150107
+# theme has a responsive layout? (mobile-optimized)
+responsive_layout: 1
 
 ######################################################################
 # core plugins
-#   (editpage, git, htmlscrubber, inline, link, meta, parentlinks)
+#   (editpage, git, htmlscrubber, inline, link, meta, parentlinks,
+#    templatebody)
 ######################################################################
 
 # git plugin
@@ -133,7 +150,6 @@ git_wrapper_background_command: git push origin master
 # gitweb url to show file history ([[file]] substituted)
 historyurl: https://git.gitano.org.uk/gitano-wiki.git/log/[[file]]
 # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)
-#diffurl: http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]
 diffurl: https://git.gitano.org.uk/gitano-wiki.git/diff/[[file]]?id=[[sha1_commit]]&id2=[[sha1_parent]]
 # where to pull and push changes (set to empty string to disable)
 gitorigin_branch: origin
@@ -142,7 +158,7 @@ gitmaster_branch: master
 
 # htmlscrubber plugin
 # PageSpec specifying pages not to scrub
-#htmlscrubber_skip: '!*/Discussion and !postcomment(*)'
+#htmlscrubber_skip: '!*/Discussion'
 
 # inline plugin
 # enable rss feeds by default?
@@ -171,7 +187,7 @@ pingurl: []
 blogspam_pagespec: '*'
 # 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 JSON url
 #blogspam_server: ''
 
 # httpauth plugin
@@ -182,15 +198,15 @@ blogspam_pagespec: '*'
 
 # lockedit plugin
 # PageSpec controlling which pages are locked
-locked_pages: 'index'
+locked_pages: index
 
 # moderatedcomments plugin
 # PageSpec matching users or comment locations to moderate
-#moderate_pagespec: '!admin(*) or *'
+#moderate_pagespec: '*'
 
 # openid plugin
 # url pattern of openid realm (default is cgiurl)
-openid_realm: 'https://wiki.gitano.org.uk/'
+openid_realm: https://wiki.gitano.org.uk/
 # url to ikiwiki cgi to use for openid authentication (default is cgiurl)
 #openid_cgiurl: ''
 
@@ -209,9 +225,9 @@ openid_realm: 'https://wiki.gitano.org.uk/'
 # types of source files to syntax highlight
 #tohighlight: .c .h .cpp .pl .py Makefile:make
 # location of highlight's filetypes.conf
-#filetypes_conf: /etc/highlight/filetypes.conf
+filetypes_conf: /etc/highlight//filetypes.conf
 # location of highlight's langDefs directory
-#langdefdir: /usr/share/highlight/langDefs
+langdefdir: /usr/share/highlight/langDefs
 
 # mdwn plugin
 # enable multimarkdown features?
@@ -221,7 +237,7 @@ multimarkdown: 1
 
 ######################################################################
 # special-purpose plugins
-#   (osm)
+#   (osm, underlay)
 ######################################################################
 
 # osm plugin
@@ -235,11 +251,24 @@ multimarkdown: 1
 #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/dsilvers/wiki.underlay
 
 ######################################################################
 # web plugins
-#   (404, attachment, comments, editdiff, edittemplate, google, goto,
-#    mirrorlist, repolist, search, theme, userlist, websetup, wmd)
+#   (404, attachment, comments, editdiff, edittemplate, getsource, google,
+#    goto, mirrorlist, remove, rename, repolist, search, theme, userlist,
+#    websetup, wmd)
 ######################################################################
 
 # attachment plugin
@@ -250,9 +279,10 @@ allowed_attachments: (virusfree() and mimetype(image/*) and maxsize(50kb)) or ad
 
 # comments plugin
 # PageSpec of pages where comments are allowed
-comments_pagespec: 'posts/*'
+comments_pagespec: posts/*
 # PageSpec of pages where posting new comments is not allowed
-comments_closed_pagespec: '!page(posts/*) or page(posts/*/*) or tagged(converted-badly-from-textile) or tagged(draft)'
+comments_closed_pagespec: '!page(posts/*) or page(posts/*/*) or tagged(converted-badly-from-textile)
+  or tagged(draft)'
 # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"
 comments_pagename: comment_
 # Interpret directives in comments?
@@ -261,6 +291,12 @@ 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: ''
+
+# getsource plugin
+# Mime type for returned source.
+#getsource_mimetype: text/plain; charset=utf-8
 
 # mirrorlist plugin
 # list of mirrors
@@ -275,7 +311,9 @@ comments_commit: 1
 
 # search plugin
 # path to the omega cgi program
-#omega_cgi: /usr/lib/cgi-bin/omega/omega
+omega_cgi: /usr/lib/cgi-bin/omega/omega
+# use google site search rather than internal xapian index?
+google_search: 0
 
 # theme plugin
 # name of theme to enable
@@ -285,7 +323,7 @@ comments_commit: 1
 # list of plugins that cannot be enabled/disabled via the web interface
 #websetup_force_plugins: []
 # list of additional setup field keys to treat as unsafe
-#websetup_unsafe: []
+websetup_unsafe: []
 # show unsafe settings, read-only, in web interface?
 websetup_show_unsafe: 1
 
@@ -301,12 +339,16 @@ websetup_show_unsafe: 1
 # calendar plugin
 # base of the archives hierarchy
 archivebase: archives
-# PageSpec of pages to include in the archives; used by ikiwiki-calendar command
+# PageSpec of pages to include in the archives, if option `calendar_autocreate` is true.
 archive_pagespec: page(posts/*) and !*/Discussion and !tagged(draft)
+# autocreate new calendar pages?
+calendar_autocreate: 1
+# if set, when building calendar pages, also build pages of year and month when no pages were published (building empty calendars).
+calendar_fill_gaps: 1
 
 # listdirectives plugin
 # directory in srcdir that contains directive descriptions
-#directive_description_dir: ikiwiki/directive
+directive_description_dir: ikiwiki/directive
 
 # teximg plugin
 # Should teximg use dvipng to render, or dvips and convert?
@@ -336,21 +378,18 @@ archive_pagespec: page(posts/*) and !*/Discussion and !tagged(draft)
 #    filecheck, flattr, goodstuff, htmlbalance, localstyle, notifyemail,
 #    pagetemplate, pingee, pinger, prettydate, recentchanges,
 #    recentchangesdiff, relativedate, rsync, sidebar, smiley,
-#    sortnaturally, tag, testpagespec, trail, transient, underlay)
+#    sortnaturally, tag, testpagespec, trail, transient)
 ######################################################################
 
 # aggregate plugin
 # enable aggregation to internal pages?
-#aggregateinternal: 1
+aggregateinternal: 1
 # allow aggregation to be triggered via the web?
 #aggregate_webtrigger: 0
-# cookie control
-#cookiejar:
-#  file: /home/dsilvers/.ikiwiki/cookies
 
 # autoindex plugin
 # commit autocreated index pages
-#autoindex_commit: 1
+autoindex_commit: 1
 
 # camelcase plugin
 # list of words to not turn into links
@@ -366,7 +405,7 @@ archive_pagespec: page(posts/*) and !*/Discussion and !tagged(draft)
 
 # prettydate plugin
 # format to use to display date
-#prettydateformat: '%X, %B %o, %Y'
+prettydateformat: '%X, %B %o, %Y'
 
 # recentchanges plugin
 # name of the recentchanges page
@@ -389,8 +428,3 @@ tagbase: tag
 tag_autocreate: 1
 # commit autocreated tag pages
 tag_autocreate_commit: 1
-
-# underlay plugin
-# extra underlay directories to add
-#add_underlays:
-#- /home/dsilvers/websites/digital-scurf.org/blog/gresille-ikiwiki/jscalendar/underlays