Set a one week delay for account deletion

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index dd0086b70a5e9f21854f9dde79d7fb80fae43a9d..ea0287a975bba35e40f00bf1066142edb9445189 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -149,6 +149,7 @@ rails_port "www.openstreetmap.org" do
   signup_email_per_day 1
   signup_email_max_burst 2
   doorkeeper_signing_key web_passwords["openid_connect_key"].join("\n")
   signup_email_per_day 1
   signup_email_max_burst 2
   doorkeeper_signing_key web_passwords["openid_connect_key"].join("\n")

+  user_account_deletion_delay 7 * 24

   # 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
   # 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 4d266f54adb530ba66cdcc53b080df7f5e778071..2dcbbc5861f3e202dbefe99c94a0c3b80ec6891e 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -92,6 +92,7 @@ property :signup_ip_max_burst, Integer
 property :signup_email_per_day, Integer
 property :signup_email_max_burst, Integer
 property :doorkeeper_signing_key, String
 property :signup_email_per_day, Integer
 property :signup_email_max_burst, Integer
 property :doorkeeper_signing_key, String

+property :user_account_deletion_delay, Integer

 
 action :create do
   package %W[
 
 action :create do
   package %W[


@@ -349,7 +350,8 @@ action :create do
     "signup_ip_max_burst",
     "signup_email_per_day",
     "signup_email_max_burst",
     "signup_ip_max_burst",
     "signup_email_per_day",
     "signup_email_max_burst",

-    "doorkeeper_signing_key"
+    "doorkeeper_signing_key",
+    "user_account_deletion_delay"

   ).compact.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,
   ).compact.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,