feat: new configuration system (and schema) (#2819)

app/models/bounce_message.rb

@@ -14,7 +14,7 @@ class BounceMessage
     mail.subject = "Mail Delivery Failed (#{@message.subject})"
     mail.text_part = body
     mail.attachments["Original Message.eml"] = { mime_type: "message/rfc822", encoding: "quoted-printable", content: @message.raw_message }
-    mail.message_id = "<#{SecureRandom.uuid}@#{Postal.config.dns.return_path}>"
+    mail.message_id = "<#{SecureRandom.uuid}@#{Postal::Config.dns.return_path_domain}>"
     mail.to_s
   end
 
@@ -32,7 +32,7 @@ class BounceMessage
   end
 
   def postmaster_address
-    @server.postmaster_address || "postmaster@#{@message.domain&.name || Postal.config.web.host}"
+    @server.postmaster_address || "postmaster@#{@message.domain&.name || Postal::Config.postal.web_hostname}"
   end
 
   private

app/models/concerns/has_dns_checks.rb

@@ -49,10 +49,10 @@ module HasDNSChecks
       self.spf_status = "Missing"
       self.spf_error = "No SPF record exists for this domain"
     else
-      suitable_spf_records = spf_records.grep(/include:\s*#{Regexp.escape(Postal.config.dns.spf_include)}/)
+      suitable_spf_records = spf_records.grep(/include:\s*#{Regexp.escape(Postal::Config.dns.spf_include)}/)
       if suitable_spf_records.empty?
         self.spf_status = "Invalid"
-        self.spf_error = "An SPF record exists but it doesn't include #{Postal.config.dns.spf_include}"
+        self.spf_error = "An SPF record exists but it doesn't include #{Postal::Config.dns.spf_include}"
         false
       else
         self.spf_status = "OK"
@@ -108,11 +108,11 @@ module HasDNSChecks
       self.mx_status = "Missing"
       self.mx_error = "There are no MX records for #{name}"
     else
-      missing_records = Postal.config.dns.mx_records.dup - records.map { |r| r.to_s.downcase }
+      missing_records = Postal::Config.dns.mx_records.dup - records.map { |r| r.to_s.downcase }
       if missing_records.empty?
         self.mx_status = "OK"
         self.mx_error = nil
-      elsif missing_records.size == Postal.config.dns.mx_records.size
+      elsif missing_records.size == Postal::Config.dns.mx_records.size
         self.mx_status = "Missing"
         self.mx_error = "You have MX records but none of them point to us."
       else
@@ -136,12 +136,12 @@ module HasDNSChecks
     if records.empty?
       self.return_path_status = "Missing"
       self.return_path_error = "There is no return path record at #{return_path_domain}"
-    elsif records.size == 1 && records.first == Postal.config.dns.return_path
+    elsif records.size == 1 && records.first == Postal::Config.dns.return_path_domain
       self.return_path_status = "OK"
       self.return_path_error = nil
     else
       self.return_path_status = "Invalid"
-      self.return_path_error = "There is a CNAME record at #{return_path_domain} but it points to #{records.first} which is incorrect. It should point to #{Postal.config.dns.return_path}."
+      self.return_path_error = "There is a CNAME record at #{return_path_domain} but it points to #{records.first} which is incorrect. It should point to #{Postal::Config.dns.return_path_domain}."
     end
   end
 

app/models/domain.rb

@@ -104,7 +104,7 @@ class Domain < ApplicationRecord
   end
 
   def spf_record
-    "v=spf1 a mx include:#{Postal.config.dns.spf_include} ~all"
+    "v=spf1 a mx include:#{Postal::Config.dns.spf_include} ~all"
   end
 
   def dkim_record
@@ -117,7 +117,7 @@ class Domain < ApplicationRecord
   def dkim_identifier
     return nil unless dkim_identifier_string
 
-    Postal.config.dns.dkim_identifier + "-#{dkim_identifier_string}"
+    Postal::Config.dns.dkim_identifier + "-#{dkim_identifier_string}"
   end
 
   def dkim_record_name
@@ -128,7 +128,7 @@ class Domain < ApplicationRecord
   end
 
   def return_path_domain
-    "#{Postal.config.dns.custom_return_path_prefix}.#{name}"
+    "#{Postal::Config.dns.custom_return_path_prefix}.#{name}"
   end
 
   # Returns a DNSResolver instance that can be used to perform DNS lookups needed for
@@ -136,13 +136,13 @@ class Domain < ApplicationRecord
   #
   # @return [DNSResolver]
   def resolver
-    return DNSResolver.local if Postal.config.general.use_local_ns_for_domains?
+    return DNSResolver.local if Postal::Config.postal.use_local_ns_for_domain_verification?
 
     @resolver ||= DNSResolver.for_domain(name)
   end
 
   def dns_verification_string
-    "#{Postal.config.dns.domain_verify_prefix} #{verification_token}"
+    "#{Postal::Config.dns.domain_verify_prefix} #{verification_token}"
   end
 
   def verify_with_dns

app/models/incoming_message_prototype.rb

@@ -88,7 +88,7 @@ class IncomingMessagePrototype
       mail.from = @from
       mail.subject = @subject
       mail.text_part = @plain_body
-      mail.message_id = "<#{SecureRandom.uuid}@#{Postal.config.dns.return_path}>"
+      mail.message_id = "<#{SecureRandom.uuid}@#{Postal::Config.dns.return_path_domain}>"
       attachments.each do |attachment|
         mail.attachments[attachment[:name]] = {
           mime_type: attachment[:content_type],

app/models/outgoing_message_prototype.rb

@@ -25,7 +25,7 @@ class OutgoingMessagePrototype
     @source_type = source_type
     @custom_headers = {}
     @attachments = []
-    @message_id = "#{SecureRandom.uuid}@#{Postal.config.dns.return_path}"
+    @message_id = "#{SecureRandom.uuid}@#{Postal::Config.dns.return_path_domain}"
     attributes.each do |key, value|
       instance_variable_set("@#{key}", value)
     end

app/models/route.rb

@@ -89,7 +89,7 @@ class Route < ApplicationRecord
   end
 
   def forward_address
-    @forward_address ||= "#{token}@#{Postal.config.dns.route_domain}"
+    @forward_address ||= "#{token}@#{Postal::Config.dns.route_domain}"
   end
 
   def wildcard?

app/models/server.rb

@@ -71,8 +71,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, -> { Postal.config.general.default_spam_threshold }
-  default_value :spam_failure_threshold, -> { Postal.config.general.default_spam_failure_threshold }
+  default_value :spam_threshold, -> { Postal::Config.postal.default_spam_threshold }
+  default_value :spam_failure_threshold, -> { Postal::Config.postal.default_spam_failure_threshold }
 
   validates :name, presence: true, uniqueness: { scope: :organization_id, case_sensitive: false }
   validates :mode, inclusion: { in: MODES }

app/models/track_domain.rb

@@ -58,12 +58,12 @@ class TrackDomain < ApplicationRecord
     if records.empty?
       self.dns_status = "Missing"
       self.dns_error = "There is no record at #{full_name}"
-    elsif records.size == 1 && records.first == Postal.config.dns.track_domain
+    elsif records.size == 1 && records.first == Postal::Config.dns.track_domain
       self.dns_status = "OK"
       self.dns_error = nil
     else
       self.dns_status = "Invalid"
-      self.dns_error = "There is a CNAME record at #{full_name} but it points to #{records.first} which is incorrect. It should point to #{Postal.config.dns.track_domain}."
+      self.dns_error = "There is a CNAME record at #{full_name} but it points to #{records.first} which is incorrect. It should point to #{Postal::Config.dns.track_domain}."
     end
     self.dns_checked_at = Time.now
     save!