Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / doc / spam_fighting.mdwn

diff --git a/doc/spam_fighting.mdwn b/doc/spam_fighting.mdwn
index 0e1047675cfbdcb1d1fb47e54b6e7b47f03a83a6..e5aa9f63e1b3f84442ad3007f22c0501792dac22 100644 (file)
--- a/doc/spam_fighting.mdwn
+++ b/doc/spam_fighting.mdwn
@@ -10,7 +10,8 @@ to the setup branch in git to be able to update the ban list, get in touch
 with joey with a ssh public key. Once your key is added, you will be able
 to edit the ikiwiki.setup file on the setup branch, and push changes.
 You will also be able to access the recent web server logs to find IP
 with joey with a ssh public key. Once your key is added, you will be able
 to edit the ikiwiki.setup file on the setup branch, and push changes.
 You will also be able to access the recent web server logs to find IP

-addresses, by running: `ssh b-ikiwiki@ikiwiki.info logdump > access.log`
+addresses from recent web edits, by running: `ssh b-ikiwiki@ikiwiki.info
+logdump | grep 'GET .*\?updated HTTP\/' > access.log`.

 
 ## Spam commits
 
 
 ## Spam commits
 


@@ -19,11 +20,10 @@ Commit  | Date       | Login     | IP
 854588d | 2013/08/15 | webschen1 | 79.228.6.28
 d8f1faa | 2013/08/16 | webschen1 | 79.228.11.79
 d1dbd8e | 2013/08/19 | webschen1 | 79.228.8.176
 854588d | 2013/08/15 | webschen1 | 79.228.6.28
 d8f1faa | 2013/08/16 | webschen1 | 79.228.11.79
 d1dbd8e | 2013/08/19 | webschen1 | 79.228.8.176

+6602052 | 2013/08/21 | webschen1 | 31.17.11.19
+d93a948 | 2013/09/05 | soman81   | 31.17.11.19
+568fdb0 | 2013/09/05 | soman81   | 31.17.11.19
+d759052 | 2013/09/08 | spain1001 | 80.187.106.2
+24a1c62 | 2013/09/15 | spain1001 | 80.187.106.136
+cba01c2 | 2013/09/15 | spain1001 | 80.187.106.136

 """]]
 """]]

-
-[[schmonz]] attempted to ban `webschen1` and `ip(79.228.*.*)` and got this:
-
-    remote: you are not allowed to change refs/heads/setup
-    To git://git.ikiwiki.info/
-     ! [remote rejected] setup -> setup (pre-receive hook declined)
-    error: failed to push some refs to 'git://git.ikiwiki.info/'