From d8adce1da96f615a936b0328554ed31483021b9a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 17 Mar 2026 18:39:31 +0000
Subject: [PATCH] Enable turnstile for the main web site

---
 cookbooks/web/recipes/rails.rb        | 2 ++
 cookbooks/web/resources/rails_port.rb | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 3f1163f2c..b994ee829 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -160,6 +160,8 @@ rails_port "www.openstreetmap.org" do
   signup_email_max_burst 2
   doorkeeper_signing_key web_passwords["openid_connect_key"].join("\n")
   user_account_deletion_delay 7 * 24
+  turnstile_site_key "0x4AAAAAACsSjCdlK-9Cu3FO"
+  turnstile_secret_key web_passwords["cloudflare_turnstile_secret"]
   # Requests to modify the imagery blacklist should come from the DWG only
   imagery_blacklist [
     # Current Google imagery URLs have google or googleapis in the domain
diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 9c503abf7..9211adbca 100644
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -97,6 +97,8 @@ property :signup_email_per_day, Integer
 property :signup_email_max_burst, Integer
 property :doorkeeper_signing_key, String
 property :user_account_deletion_delay, Integer
+property :turnstile_site_key, String
+property :turnstile_secret_key, String
 
 action :create do
   package %w[
@@ -355,7 +357,9 @@ action :create do
     "signup_email_per_day",
     "signup_email_max_burst",
     "doorkeeper_signing_key",
-    "user_account_deletion_delay"
+    "user_account_deletion_delay",
+    "turnstile_site_key",
+    "turnstile_secret_key"
   ).compact.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,
-- 
2.39.5