fix openid realm config to work with https

[git.ikiwiki.info.git] / ikiwiki.setup

diff --git a/ikiwiki.setup b/ikiwiki.setup
index e7a20eb8a107713f6c02ee266489326b0c5682d1..40bfdc39bcdf21efe09468b972905c661e857c10 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -14,8 +14,20 @@ 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
@@ -23,6 +35,7 @@ banned_users:
   - 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
@@ -60,6 +73,11 @@ banned_users:
   - 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
@@ -117,6 +135,7 @@ add_plugins:
   - highlight
   - comments
   - gitpush
+  - blogspam
 # plugins to disable
 disable_plugins: []
 # additional directory to search for template files
@@ -264,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
@@ -278,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
@@ -286,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