Ryan Lane has submitted this change and it was merged.

Change subject: Add one more misbehaving bot, copy full bad_browser list to 
gitblit
......................................................................


Add one more misbehaving bot, copy full bad_browser list to gitblit

Change-Id: I0880a89b8dc9fd339e83121d2209e8c10cd68e42
---
M templates/apache/sites/gerrit.wikimedia.org.erb
M templates/apache/sites/git.wikimedia.org.erb
2 files changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Ryan Lane: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/apache/sites/gerrit.wikimedia.org.erb 
b/templates/apache/sites/gerrit.wikimedia.org.erb
index 1b6f25d..4196a4b 100644
--- a/templates/apache/sites/gerrit.wikimedia.org.erb
+++ b/templates/apache/sites/gerrit.wikimedia.org.erb
@@ -60,6 +60,7 @@
        SetEnvIf User-Agent Baiduspider bad_browser
        SetEnvIf User-Agent Sogou bad_browser
        SetEnvIf User-Agent TweetmemeBot bad_browser
+       SetEnvIf User-Agent Yeti bad_browser
        SetEnvIf Remote_Addr 208.110.84.34 bad_browser
        SetEnvIf Remote_Addr 89.83.122.45 bad_browser
        SetEnvIf Remote_Addr 129.242.4.62 bad_browser
diff --git a/templates/apache/sites/git.wikimedia.org.erb 
b/templates/apache/sites/git.wikimedia.org.erb
index a3f22fe..7322425 100644
--- a/templates/apache/sites/git.wikimedia.org.erb
+++ b/templates/apache/sites/git.wikimedia.org.erb
@@ -51,8 +51,16 @@
        RequestHeader set X-Forwarded-Proto https
        RequestHeader set X-Forwarded-Port 443
 
+       # Misbehaving bots
        SetEnvIf User-Agent 80legs bad_browser
        SetEnvIf User-Agent bingbot bad_browser
+       SetEnvIf User-Agent Baiduspider bad_browser
+       SetEnvIf User-Agent Sogou bad_browser
+       SetEnvIf User-Agent TweetmemeBot bad_browser
+       SetEnvIf User-Agent Yeti bad_browser
+       SetEnvIf Remote_Addr 208.110.84.34 bad_browser
+       SetEnvIf Remote_Addr 89.83.122.45 bad_browser
+       SetEnvIf Remote_Addr 129.242.4.62 bad_browser
 
        TimeOut 720
 

-- 
To view, visit https://gerrit.wikimedia.org/r/75492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0880a89b8dc9fd339e83121d2209e8c10cd68e42
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to