From 724325a1b97d61ef1e134240e4f70aaad39dbf98 Mon Sep 17 00:00:00 2001 From: Adam Cooke Date: Mon, 2 Aug 2021 16:17:18 +0000 Subject: [PATCH] feat: support for configuring the default spam threshold values for new servers --- app/models/server.rb | 4 ++-- config/postal.defaults.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/server.rb b/app/models/server.rb index 53c46497..c2b73195 100644 --- a/app/models/server.rb +++ b/app/models/server.rb @@ -69,8 +69,8 @@ class Server < ApplicationRecord default_value :raw_message_retention_days, -> { 30 } default_value :raw_message_retention_size, -> { 2048 } default_value :message_retention_days, -> { 60 } - default_value :spam_threshold, -> { 5.0 } - default_value :spam_failure_threshold, -> { 20.0 } + default_value :spam_threshold, -> { Postal.config.general.default_spam_threshold } + default_value :spam_failure_threshold, -> { Postal.config.general.default_spam_failure_threshold } validates :name, :presence => true, :uniqueness => {:scope => :organization_id} validates :mode, :inclusion => {:in => MODES} diff --git a/config/postal.defaults.yml b/config/postal.defaults.yml index 7d237c69..5b30dfbc 100644 --- a/config/postal.defaults.yml +++ b/config/postal.defaults.yml @@ -15,6 +15,8 @@ general: maximum_hold_expiry_days: 7 suppression_list_removal_delay: 30 use_local_ns_for_domains: false + default_spam_threshold: 5.0 + default_spam_failure_threshold: 20.0 web_server: bind_address: 127.0.0.1