Merge pull request #180 from cdmurph32/tcp_timeout_wait

Kernel 4.9 tcp_timeout_time_wait
adobe-platform · May 26, 2017 · 28071a2 · 28071a2
2 parents 6abe4a4 + 50286b1
commit 28071a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 `porter` is [semantically versioned](http://semver.org/spec/v2.0.0.html)
 
+### v4.8.1
+
+- Replace deprecated sysctl setting
+
 ### v4.8.0
 
 - HAProxy `timeout client` is configurable

diff --git a/files/porter_bootstrap b/files/porter_bootstrap
@@ -59,7 +59,7 @@ porter host daemon --init \
 
 # keep-alive on haproxy backends is disabled meaning lots of sockets in
 # TIME_WAIT hanging around. reuse them
-sysctl -w net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait=1
+sysctl -w net.netfilter.nf_conntrack_tcp_timeout_time_wait=1
 sysctl -w net.ipv4.tcp_tw_reuse=1
 
 # open up ephemeral port range for more possible connections to the backend