ArielGlenn has submitted this change and it was merged.
Change subject: reinstate bandwidth and conn caps for dumps.wm.org
......................................................................
reinstate bandwidth and conn caps for dumps.wm.org
turns out that the pipe can handle more than the disks. values
may need to be tweaked.
Change-Id: I7076b65d30b7abf24375816e3dd30875854485c3
---
M modules/dumps/manifests/init.pp
M modules/dumps/templates/nginx.dumps.conf.erb
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dumps/manifests/init.pp b/modules/dumps/manifests/init.pp
index 1d85873..aa9807b 100644
--- a/modules/dumps/manifests/init.pp
+++ b/modules/dumps/manifests/init.pp
@@ -1,7 +1,9 @@
class dumps {
install_certificate{ 'dumps.wikimedia.org': ca =>
'RapidSSL_SHA256_CA_-_G3.crt' }
- include ::nginx
+ class { '::nginx':
+ variant => 'extras',
+ }
$ssl_settings = ssl_ciphersuite('nginx', 'compat')
diff --git a/modules/dumps/templates/nginx.dumps.conf.erb
b/modules/dumps/templates/nginx.dumps.conf.erb
index 113222e..33d6326 100644
--- a/modules/dumps/templates/nginx.dumps.conf.erb
+++ b/modules/dumps/templates/nginx.dumps.conf.erb
@@ -16,6 +16,9 @@
index index.html index.htm;
autoindex on;
charset utf-8;
+ limit_rate 256k;
+ limit_rate_after 1m;
+ limit_conn addr 3;
}
rewrite ^/other/(iOS|PlayBook|win8|android)(|/.*)$
$scheme://releases.wikimedia.org/mobile/$1$2 break;
--
To view, visit https://gerrit.wikimedia.org/r/189447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7076b65d30b7abf24375816e3dd30875854485c3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
