X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c355474a84b6c8bbe4beba8ce27bde8e5782639d..169397a6f0c4043537abb103da03c82b857adf27:/ikiwiki.setup?ds=sidebyside

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 1ed94a177..23ce406c4 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -15,7 +15,6 @@ adminemail: admin@branchable.com
 adminuser:
 - http://joey.kitenet.net/
 - http://joeyh.name/
-- smcv
 # users who are banned from the wiki
 banned_users:
 - http://tonyguards.myopenid.com/
@@ -95,6 +94,11 @@ banned_users:
 - ip(122.173.*.*)
 - https://www.google.com/accounts/o8/id?id=AItOawlyeMDnU_eaFpTAKNEyeZJJIcWPdLyz3js
 - ip(187.209.217.54)
+- https://me.yahoo.com/a/7bUPkZg.gdHGMU8azO0bnVfS23aU5iT7h263LhiVB3r9j6W_yUR9lX1Ia6UJfs247nNtKGg-*
+- ip(136.0.0.90)
+- jhakasbaba76
+- jhakasbaba76@c741fb7726e8ce4a230bc1a0d48fbeb496e46f89
+- ip(110.172.140.98)
 # where the source of the wiki is located
 srcdir: /home/b-ikiwiki/source/doc
 # where to build the wiki
@@ -112,7 +116,7 @@ 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: ''
+cgi_overload_message: Please wait..
 # enable optimization of only refreshing committed changes?
 only_committed_changes: 0
 # rcs backend to use
@@ -227,6 +231,8 @@ cookiejar:
 useragent: ikiwiki/3.20150330
 # theme has a responsive layout? (mobile-optimized)
 responsive_layout: 1
+# try harder to produce deterministic output
+deterministic: 0
 
 ######################################################################
 # core plugins
@@ -294,6 +300,8 @@ created: 1305836524
 ipv6_disabled: 0
 # redirect from http to https?
 redirect_to_https: 0
+# use Lets Encrypt to generate https certificate?
+use_letsencrypt: 1
 
 # inline plugin
 # enable rss feeds by default?
@@ -325,6 +333,10 @@ blogspam_pagespec: '*'
 # blogspam server JSON url
 #blogspam_server: ''
 
+# emailauth plugin
+# email address to send emailauth mails as (default: adminemail)
+emailauth_sender: login@branchable.com
+
 # httpauth plugin
 # url to redirect to when authentication is needed
 #cgiauthurl: http://example.com/wiki/auth/ikiwiki.cgi
@@ -508,6 +520,10 @@ websetup_show_unsafe: 0
 # 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
 
+# img plugin
+# Image formats to process (jpeg, png, gif, svg, pdf or 'everything' to accept all)
+#img_allowed_formats: ''
+
 # listdirectives plugin
 # directory in srcdir that contains directive descriptions
 directive_description_dir: ikiwiki/directive