Remove rails memory limit support

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index 8076b9bec1407ba38b4deb6298e86fa926ead578..cbc967e4d3762b178737c9986ca3dc225bae26fe 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -170,14 +170,6 @@ define :rails_port, :action => [:create, :enable] do
       line.gsub!(/^( *)#quova_password:.*$/, "\\1quova_password: \"#{params[:quova_password]}\"")
     end
 
       line.gsub!(/^( *)#quova_password:.*$/, "\\1quova_password: \"#{params[:quova_password]}\"")
     end
 

-    if params[:soft_memory_limit]
-      line.gsub!(/^( *)#soft_memory_limit:.*$/, "\\1soft_memory_limit: #{params[:soft_memory_limit]}")
-    end
-
-    if params[:hard_memory_limit]
-      line.gsub!(/^( *)#hard_memory_limit:.*$/, "\\1hard_memory_limit: #{params[:hard_memory_limit]}")
-    end
-

     if params[:gpx_dir]
       line.gsub!(/^( *)gpx_trace_dir:.*$/, "\\1gpx_trace_dir: \"#{params[:gpx_dir]}/traces\"")
       line.gsub!(/^( *)gpx_image_dir:.*$/, "\\1gpx_image_dir: \"#{params[:gpx_dir]}/images\"")
     if params[:gpx_dir]
       line.gsub!(/^( *)gpx_trace_dir:.*$/, "\\1gpx_trace_dir: \"#{params[:gpx_dir]}/traces\"")
       line.gsub!(/^( *)gpx_image_dir:.*$/, "\\1gpx_image_dir: \"#{params[:gpx_dir]}/images\"")

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 6616c49f0980434733d86e26d2968f2f40254110..926ff38ceb12778d7a1c5874a5a841de561adf00 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -57,8 +57,6 @@ rails_port "www.openstreetmap.org" do
   messages_domain "messages.openstreetmap.org"
   quova_username "ws360602"
   quova_password web_passwords["quova"]
   messages_domain "messages.openstreetmap.org"
   quova_username "ws360602"
   quova_password web_passwords["quova"]

-  soft_memory_limit node[:web][:rails_soft_memory_limit]
-  hard_memory_limit node[:web][:rails_hard_memory_limit]

   gpx_dir "/store/rails/gpx"
   attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"
   gpx_dir "/store/rails/gpx"
   attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"

diff --git a/roles/web-backend.rb b/roles/web-backend.rb
index 91cd6faacb42085a308b93edb1418e38352f39f9..d77ea1b95db5f8148272d7fb6246e79b7dd1ac73 100644 (file)
--- a/roles/web-backend.rb
+++ b/roles/web-backend.rb
@@ -13,10 +13,6 @@ default_attributes(
   },
   :passenger => {
     :max_pool_size => 12
   },
   :passenger => {
     :max_pool_size => 12

-  },
-  :web => {
-    :rails_soft_memory_limit => 512,
-    :rails_hard_memory_limit => 2048

   }
 )
 
   }
 )
 

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index eab62f715dcc404b623c3d046b05cd0475021ff6..faa1017de89d6655a843bf95530f10ff28e03be2 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -16,10 +16,6 @@ default_attributes(
   :passenger => {
     :max_pool_size => 50
   },
   :passenger => {
     :max_pool_size => 50
   },

-  :web => {
-    :rails_soft_memory_limit => 256,
-    :rails_hard_memory_limit => 1024
-  },

   :exim => {
     :local_domains => ["messages.openstreetmap.org"],
     :trusted_users => ["rails"],
   :exim => {
     :local_domains => ["messages.openstreetmap.org"],
     :trusted_users => ["rails"],