X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ef108061da787af16d484cae6f7571779fdd454d..4fe5a86414cdd227f53cae75ade81669de959b5d:/ikiwiki.setup?ds=sidebyside

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 811d2a623..40bfdc39b 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -14,13 +14,28 @@ adminemail: joey@ikiwiki.info
 # users who are wiki admins
 adminuser:
   - http://joey.kitenet.net/
+  - http://joeyh.name/
 # users who are banned from the wiki
 banned_users:
+  - http://tonyguards.myopenid.com/
+  - http://butoijoh.myopenid.com/
+  - ip(62.219.8.238)
+  - ip(184.105.146.11)
+  - ip(184.105.146.6)
+  - ip(149.135.147.88)
+  - https://www.google.com/accounts/o8/id?id=AItOawnAq_X98v6qKJFwl-MyLb440vC8laTdiMg
+  - https://www.google.com/accounts/o8/id?id=AItOawm_nWF_tPw8mLI7rMxfykA_d3FehQNvWpI
+  - https://www.google.com/accounts/o8/id?id=AItOawkTn3HixU2KJIvvLXLqwYUzlDGDtYf43GE
+  - https://www.google.com/accounts/o8/id?id=AItOawkDOCT-KTCLpieip-2W0N51gZwF7nGLaS0
+  - https://www.google.com/accounts/o8/id?id=AItOawl8-V-Yp0F5ZWRmDb7j4ul1gsbMXjghDIU
+  - https://www.google.com/accounts/o8/id?id=AItOawkaL6e6GtpyD7gJyqHphon_5ES1ACDLJgg
+  - https://www.google.com/accounts/o8/id?id=AItOawnv-w7GplWln2P55lnzc6Ds-ltzk6sNxDY
   - https://me.yahoo.com/a/3hUnH9Qi24uk3RwCwHATJBWKVyqc#7d8b8
   - ip(95.65.50.150)
   - https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de
   - https://www.google.com/accounts/o8/id?id=AItOawkuR0eo_HO1s1hs49h0Y_4Bzm08l9evMEc
   - https://www.google.com/accounts/o8/id?id=AItOawlYXeKSEBoSCzES7o5VYiSratG5RfNucL0
+  - https://www.google.com/accounts/o8/id?id=AItOawl_wuvPHDhkuMVnEOP5jLrZyd3nnBs8YRw
   - ip(115.43.30.149)
   - ikiwikiweb
   - webkatalog
@@ -52,6 +67,17 @@ banned_users:
   - WikiJeanHawkins
   - nicole.adams
   - Smith
+  - quentin
+  - quentinfudge
+  - https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A
+  - ip(123.26.115.218)
+  - https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8
+  - ip(123.26.124.157)
+  - KataMutiara
+  - tekschen
+  - ip(80.187.102.194)
+  - webschen1
+  - ip(79.228.*.*)
 # where the source of the wiki is located
 srcdir: /home/b-ikiwiki/source/doc
 # where to build the wiki
@@ -108,6 +134,8 @@ add_plugins:
   - repolist
   - highlight
   - comments
+  - gitpush
+  - blogspam
 # plugins to disable
 disable_plugins: []
 # additional directory to search for template files
@@ -128,7 +156,7 @@ indexpages: 0
 discussion: 1
 # name of Discussion pages
 discussionpage: Discussion
-# generate HTML5? (experimental)
+# generate HTML5?
 html5: 0
 # only send cookies over SSL connections?
 sslcookie: 0
@@ -156,7 +184,7 @@ libdir: /home/b-ikiwiki/.ikiwiki
 ENV:
   TMPDIR: /home/b-ikiwiki/tmp
 # time zone name
-#timezone: US/Eastern
+timezone: JEST+4
 # regexp of normally excluded files to include
 #include: '^\.htaccess$'
 # regexp of files that should be skipped
@@ -204,6 +232,7 @@ gitmaster_branch: master
 # gitpush plugin
 # git repository urls that changes are pushed to
 git_push_to:
+  - git@github.com:joeyh/ikiwiki.git
   - joey@git.kitenet.net:/srv/git/ikiwiki.git
 
 # htmlscrubber plugin
@@ -214,6 +243,8 @@ htmlscrubber_skip: tipjar
 # list of urls that alias to the main url
 urlalias:
   - http://ikiwiki.branchable.com/
+  - http://ikiwiki.branchable.com/
+  - http://git.ikiwiki.info/
   - http://www.ikiwiki.info/
 # openid of primary site owner
 owner: http://joey.kitenet.net/
@@ -252,7 +283,7 @@ pingurl: []
 
 # blogspam plugin
 # PageSpec of pages to check for spam
-#blogspam_pagespec: postcomment(*)
+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
@@ -266,7 +297,7 @@ pingurl: []
 
 # lockedit plugin
 # PageSpec controlling which pages are locked
-locked_pages: tipjar
+locked_pages: tipjar or tips/DreamHost
 
 # moderatedcomments plugin
 # PageSpec matching users or comment locations to moderate
@@ -274,9 +305,9 @@ locked_pages: tipjar
 
 # openid plugin
 # url pattern of openid realm (default is cgiurl)
-openid_realm: http://*.branchable.com/
+#openid_realm: http://*.branchable.com/
 # url to ikiwiki cgi to use for openid authentication (default is cgiurl)
-openid_cgiurl: http://ikiwiki.branchable.com/ikiwiki.cgi
+#openid_cgiurl: http://ikiwiki.branchable.com/ikiwiki.cgi
 
 # passwordauth plugin
 # a password that must be entered when signing up for an account
@@ -322,8 +353,9 @@ po_link_to: default
 
 ######################################################################
 # web plugins
-#   (404, attachment, comments, editdiff, edittemplate, google, goto,
-#    mirrorlist, remove, rename, repolist, search, theme, websetup, wmd)
+#   (404, attachment, comments, editdiff, edittemplate, getsource, google,
+#    goto, mirrorlist, remove, rename, repolist, search, theme, userlist,
+#    websetup, wmd)
 ######################################################################
 
 # attachment plugin
@@ -346,6 +378,10 @@ comments_allowauthor: 0
 # commit comments to the VCS
 comments_commit: 1
 
+# getsource plugin
+# Mime type for returned source.
+#getsource_mimetype: text/plain; charset=utf-8
+
 # mirrorlist plugin
 # list of mirrors
 #mirrorlist: {}
@@ -381,15 +417,17 @@ websetup_unsafe:
   - prefix_directives
   - indexpages
   - repositories
+  - sslcookie
 # show unsafe settings, read-only, in web interface?
 websetup_show_unsafe: 0
 
 ######################################################################
 # widget plugins
 #   (calendar, color, conditional, cutpaste, date, format, fortune,
-#    graphviz, haiku, img, linkmap, listdirectives, map, more, orphans,
-#    pagecount, pagestats, poll, polygen, postsparkline, progress,
-#    shortcut, sparkline, table, template, teximg, toc, toggle, version)
+#    graphviz, haiku, headinganchors, img, linkmap, listdirectives, map,
+#    more, orphans, pagecount, pagestats, poll, polygen, postsparkline,
+#    progress, shortcut, sparkline, table, template, teximg, toc, toggle,
+#    version)
 ######################################################################
 
 # calendar plugin