From: Tom Hughes <tom@compton.nu>
Date: Sat, 4 Nov 2023 15:26:38 +0000 (+0000)
Subject: Enable cgimap with ratelimit-upload option for tomh dev site
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b2ec7c4e4db41424eb6b37fcea3dce9a826d36a1

Enable cgimap with ratelimit-upload option for tomh dev site
---

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 2afa12a09..7eed5a159 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -465,7 +465,8 @@ if node[:postgresql][:clusters][:"15/main"]
           variables :cgimap_port => cgimap_port,
                     :database_port => node[:postgresql][:clusters][:"15/main"][:port],
                     :database_name => database_name,
-                    :log_directory => log_directory
+                    :log_directory => log_directory,
+                    :options => details[:cgimap_options]
         end
 
         service "cgimap@#{name}" do
diff --git a/cookbooks/dev/templates/default/cgimap.environment.erb b/cookbooks/dev/templates/default/cgimap.environment.erb
index 743599b52..1e592cc0c 100644
--- a/cookbooks/dev/templates/default/cgimap.environment.erb
+++ b/cookbooks/dev/templates/default/cgimap.environment.erb
@@ -12,3 +12,6 @@ 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] %>"
+<% Hash(@options).each do |name, value| -%>
+CGIMAP_<%= name.to_s.upcase %>="<%= value %>"
+<% end -%>
diff --git a/roles/dev.rb b/roles/dev.rb
index 6a55e650d..3a838a353 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -117,7 +117,12 @@ default_attributes(
       },
       :tomh => {
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "next"
+        :revision => "next",
+        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_revision => "master",
+        :cgimap_options => {
+          :ratelimit_upload => true
+        }
       },
       :comments => {
         :repository => "https://github.com/ukasiu/openstreetmap-website.git",