Merge pull request #2836 from Blystad/set_elb_timeout_automatically

feat(contrib/ec2): Set ELB timeout to 1200s

Author: mboersma

contrib/ec2/deis.template.json

@@ -293,7 +293,10 @@
           {
             "Fn::GetAtt": ["DeisWebELBSecurityGroup", "GroupId"]
           }
-        ]
+        ],
+        "ConnectionSettings": {
+          "IdleTimeout": 1200
+        }
       }
     },
     "DeisWebELBSecurityGroup": {

docs/managing_deis/configure-load-balancers.rst

@@ -30,9 +30,7 @@ EC2
 ===
 
 The Deis provisioning scripts for EC2 automatically create an Elastic Load Balancer for your Deis
-cluster. However, ELBs on EC2 have a default timeout of 60 seconds, which will disrupt a ``git push``
-when using Deis. You should manually `increase this timeout`_ to 1200 seconds to match the timeout
-on the router and application unit files.
+cluster.
 
 Rackspace
 =========
@@ -53,8 +51,6 @@ You'll need to create two load balancers on Rackspace, as follows:
       Port 2222
       Protocol TCP
 
-.. _`increase this timeout`: http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/config-idle-timeout.html
-
 Google Compute Engine
 =====================