X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsnapshot%2Fhaproxy.cfg.erb;h=b7115349dfd495b90dca8c745875821d19a0a654;hb=955db7615e417fc4f8864ec059b7e0aef79d89f5;hp=9d8edfb0fba5a815f1c86e395d650478f4612623;hpb=702cdcacd66bc80c4b94c79e9e33bcfb5e17a957;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/snapshot/haproxy.cfg.erb b/modules/roles/templates/snapshot/haproxy.cfg.erb
index 9d8edfb0f..b7115349d 100644
--- a/modules/roles/templates/snapshot/haproxy.cfg.erb
+++ b/modules/roles/templates/snapshot/haproxy.cfg.erb
@@ -27,6 +27,7 @@ defaults
 	mode	http
 	option	httplog
 	option	dontlognull
+	option	forwardfor
 	timeout	connect 5000
 	timeout	client  50000
 	timeout	server  50000
@@ -49,6 +50,10 @@ frontend front_ssl
 	default_backend backend
 
 	option http-keep-alive
+	# We rate-limit requests by clients.
+	#  Currently, we do that at the netfilter level, so one
+	#  request per connection works best.
+	option httpclose
 	#option redispatch
 
 backend backend