Merge remote-tracking branch 'github/pull/458'

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index d0d14f751bb71620c0666e9e7d3df5603860de2a..a76af78a7f627b24e82597bc0d89ef14ed5d36b4 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -9,17 +9,8 @@ default_attributes(
       }
     }
   },
-  :networking => {
-    :tcp_fastopen_key => "tile"
-  },
   :nginx => {
-    :access_log => false,
-    :cache => {
-      :proxy => {
-        :enable => true,
-        :keys_zone => "proxy_cache_zone:128M"
-      }
-    }
+    :access_log => false
   },
   :sysctl => {
     :sockets => {
@@ -52,12 +43,6 @@ default_attributes(
         "net.ipv4.tcp_tw_reuse" => 1
       }
     },
-    :kernel_tfo_listen_enable => {
-      :comment => "Enable TCP Fast Open for listening sockets",
-      :parameters => {
-        "net.ipv4.tcp_fastopen" => 3
-      }
-    },
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
       :parameters => {