coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249159
Change subject: Revert "dynamicproxy: Make blocked user agents configurable"
......................................................................
Revert "dynamicproxy: Make blocked user agents configurable"
Despite appearances, this sets the UA check regex to an empty string.
This reverts commit edb5baa8d906e16ef878791569c78d5c4298c7ba.
Change-Id: Ib56f3cbed1da6de0267579a12ef83808ebc18c82
---
M modules/dynamicproxy/manifests/init.pp
M modules/dynamicproxy/templates/urlproxy.conf
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/249159/1
diff --git a/modules/dynamicproxy/manifests/init.pp
b/modules/dynamicproxy/manifests/init.pp
index 9bbb30c..527f69d 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -31,7 +31,6 @@
$error_description = "Our servers are currently experiencing a
technical problem. This is probably temporary and should be fixed soon. Please
try again later.",
$error_details = undef,
$web_domain = undef,
- $blocked_user_agent_regex = "TweetmemeBot", # T73120 - misbehaving crawler
) {
if $ssl_certificate_name != false and $ssl_settings == undef {
fail('ssl_certificate_nme set but ssl_settings not set')
diff --git a/modules/dynamicproxy/templates/urlproxy.conf
b/modules/dynamicproxy/templates/urlproxy.conf
index de69767..7f99639 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -72,8 +72,9 @@
return 403 "Requests must have a user agent";
}
- if ($http_user_agent ~* "<% @blocked_user_agent_regex -%>") {
- return 403 "Blocked user agent";
+ # Block crawlers that do not behave well
+ if ($http_user_agent ~* "TweetmemeBot") { # T73120
+ return 403;
}
include uwsgi_params;
--
To view, visit https://gerrit.wikimedia.org/r/249159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib56f3cbed1da6de0267579a12ef83808ebc18c82
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
