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

[chef.git] / roles / web-frontend.rb

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 741a40b901e3cf3db3dbc7f7b461c9c13c99a66b..2a316491a07e6cbe1c37a54e90eb8fd3fdecae38 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -21,8 +21,8 @@ default_attributes(
       ]
     }
   },
       ]
     }
   },

-  :networking => {
-    :tcp_fastopen_key => "www"
+  :memcached => {
+    :memory_limit => 4096

   },
   :passenger => {
     :max_pool_size => 50
   },
   :passenger => {
     :max_pool_size => 50


@@ -37,7 +37,10 @@ default_attributes(
         :user => "rails",
         :group => "rails",
         :home_directory => "/srv/www.openstreetmap.org/rails",
         :user => "rails",
         :group => "rails",
         :home_directory => "/srv/www.openstreetmap.org/rails",

-        :path => "/bin:/usr/bin:/usr/local/bin"
+        :path => "/bin:/usr/bin:/usr/local/bin",
+        :environment => {
+          "RAILS_ENV" => "production"
+        }

       }
     }
   }
       }
     }
   }