Enable rate limiting for dev cgimap instances

diff --git a/cookbooks/dev/templates/default/cgimap.environment.erb b/cookbooks/dev/templates/default/cgimap.environment.erb
index a49b8f48b7db5f079418be207067ffee6947d0eb..485d58e87b6f4843324a2c2b5bbf6b2b68db1876 100644 (file)
--- a/cookbooks/dev/templates/default/cgimap.environment.erb
+++ b/cookbooks/dev/templates/default/cgimap.environment.erb
@@ -12,6 +12,7 @@ CGIMAP_MAP_AREA="<%= node[:web][:max_request_area] %>"
 CGIMAP_MAP_NODES"<%= node[:web][:max_number_of_nodes] %>"
 CGIMAP_MAX_WAY_NODES="<%= node[:web][:max_number_of_way_nodes] %>"
 CGIMAP_MAX_RELATION_MEMBERS="<%= node[:web][:max_number_of_relation_members] %>"
 CGIMAP_MAP_NODES"<%= node[:web][:max_number_of_nodes] %>"
 CGIMAP_MAX_WAY_NODES="<%= node[:web][:max_number_of_way_nodes] %>"
 CGIMAP_MAX_RELATION_MEMBERS="<%= node[:web][:max_number_of_relation_members] %>"

+CGIMAP_RATELIMIT_UPLOAD="true"

 <% Hash(@options).each do |name, value| -%>
 CGIMAP_<%= name.to_s.upcase %>="<%= value %>"
 <% end -%>
 <% Hash(@options).each do |name, value| -%>
 CGIMAP_<%= name.to_s.upcase %>="<%= value %>"
 <% end -%>

diff --git a/roles/dev.rb b/roles/dev.rb
index 65e393b076d2dc9f61e27e6fb11373975d1698d8..1800f3551a80f322e08ef58b24281fd1d21a3fe4 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -119,10 +119,7 @@ default_attributes(
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",
         :revision => "next",
         :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",
         :revision => "next",
         :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",

-        :cgimap_revision => "master",
-        :cgimap_options => {
-          :ratelimit_upload => true
-        }
+        :cgimap_revision => "master"

       },
       :comments => {
         :repository => "https://github.com/ukasiu/openstreetmap-website.git",
       },
       :comments => {
         :repository => "https://github.com/ukasiu/openstreetmap-website.git",