Merge remote-tracking branch 'tigerfell/pr257'

[chef.git] / cookbooks / web / attributes / default.rb

diff --git a/cookbooks/web/attributes/default.rb b/cookbooks/web/attributes/default.rb
index 54d692f3126837fc3b74d8aaaf0db38aba439bbb..81e7d94dff028f9c22ed541969cc29d3a0d04819 100644 (file)
--- a/cookbooks/web/attributes/default.rb
+++ b/cookbooks/web/attributes/default.rb
@@ -1,4 +1,10 @@
-default[:web][:ruby_version] = "1.9.1"
 default[:web][:base_directory] = "/srv/www.openstreetmap.org"
-default[:web][:pid_directory] = "/var/run/web"
+default[:web][:pid_directory] = "/run/web"
 default[:web][:log_directory] = "/var/log/web"
+default[:web][:primary_cluster] = false
+default[:web][:max_request_area] = 0.25
+default[:web][:max_number_of_nodes] = 50000
+default[:web][:max_number_of_way_nodes] = 2000
+default[:web][:max_number_of_relation_members] = 32000
+
+default[:accounts][:users][:rails][:status] = :role