From 50a96bc334ff8bf9c00feeb1b482ccda48bd77d8 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Thu, 6 Dec 2018 00:43:37 +0500
Subject: [PATCH] Improve configuration

---
 config/application.rb                              | 3 +++
 config/credentials.yml.enc                         | 2 +-
 config/environments/production.rb                  | 4 +---
 config/initializers/action_mailer_smtp_settings.rb | 2 +-
 config/initializers/devise.rb                      | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index bcc5275..11f9d30 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -34,6 +34,9 @@ module Partynest
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 5.2
 
+    # Fully qualified domain name.
+    config.site_domain = 'libertarian-party.com'
+
     # Settings in config/environments/* take precedence over those specified
     # here. Application configuration can go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded after loading
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index e6cdd2b..6ee49a9 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc
@@ -1 +1 @@
-3IKFR7FUYGk+8XTNO2m1JA6rNI3BtetKsWF0VXhBR1fMu2RUv2K7VNYi0LhvRXLBTi8tWklAGtvdHTeEy/KDA0MjgcqdC8UsehM6lSQ5Ya3ZK1AoeQ8zK835MjXjFQCQOOVdAiZGAbspqVJBUl/TC86k9KiTuBZR3U7FNa53sLivBV7q/A87wDg0VYbzAas/bQyM4bCbhg4tD8rLmhCTg2eT1B2FOtbDHxMH92bZegOufuWyMMs8B+pnZqIjI3p0zSdQocQ9jmOb7hTrtdq+YQMnyL1vMF/KZNjU/sjLv6V5MesndxoS+IpWts529/pcBksCuj1D9/Nl4L6LgKwpH9QXx3gc50Akd133lIsr0vs0bV5kYK9SDdU1m5PqCALBMY0qKa6P0BlkFvxu0uKveFF1cHusLtC5VmRMHbLRJ39zn1XIgUBfhkxC6t/BAex6jEu1pWVhMe4dKEgprJATkVuLR1CbKq51ySUBnbHW39mSVLe0YdF49Me3Aiiscfm/UDdEyUl6ff681p9PO5ze+DK+QBIYapv/iLSH3tkfApYFgf+Q8a9DRIhlUg8cDAidvEUiXSKRS8HJOWeOiFUog3lN1jx3k4yrc8YV2P4AWLc78Cw1sBOnuAa5dIQ98h330hlyOlSdoHA8gyl45BdFxk1ZE0ZhmeMvXgehjQmoJa1v6X861CG4V1npkUOIDHpEyZiOJi7aF4x+5ec6fTP7X+JcA9FOfzs/TVTuidXA0QkxTVINfj1m/9BJUnWjGSxr4jx5jjZnpfvH/9dnMFUO5D6FpjS3QktlvVnKxkdgvYy+YG9OvmvFcuh4Nha5jkyGjEYfLigOig+9ffeveyY6pWc64lEKVgeJq2bI2Dwjr1o+q4jAIW70brzuXesG8tWkUDbp8trlnfgufoGsxhwmP0Dhn+Hbc3fvtZqyxzNJ8lYSAdinnjWSJvgbxUCpYhzmJE8n9qUXw6f9ZtqNkbnJ3le9NCGX/U+3+jxM4BZ1hV/F0WfvIqmU1He9spyaub97jRSFtDB26Dz2rAAlp9FvEDywz38V3xF6RQ+okj/ZYQX8Jy7Asd72osKwJSF/ODsoPf29P0m2iWQ5hT9Q3VvPFQXu12jqE7eQXnX0eyFipoy+TuAiWeyR2A==--cu9ZqCXV4BjGm4WA--WQeuFQe+DoCWQbRj6YTzUg==
\ No newline at end of file
+MtKy/wYPGEJmy46Dtogsm4ksoFfgz8jI1HuP4YxCJEzSyAQ1b4jAOJVKK4b1iWYQvrVBanj7FYZ3P2JmTfVOdlu4xIp3lEzyGLRGgZvu3VJkUjPtc9oYHBcUNQKhpApj2vU6CGmePLQ8mVRv66mePn5nGHxW3jDC0OLkopvtkMxRL14RlUEloSvAC+ERx2e7ghBTyEY8AHg4hZdkoqT6E8hfOhMF2tDSigBskDzQ5fnUtlsukMQM+khNAh5wQFDRfHgcBQbXSVEMWFp4McW1I5nb3seX3JRyTL+RfWnCfcclJCufhloMZka6MPVNjXLVC3riwyCGqYr/cau7BKdF3jE9flmsamcfF/BR7MRisJAWDPjO4RRJBWjxOu6BeRcxV/ae6c89o0/zMNppK8sZKyMv8xJMpdj5dKXi3SBVcKcRUdITXW4Xva7/IuXJaODSf8PNrFsvdhm5yM9xpFX2+Nd/M7v60ggq9TIMRKpKB4lyxh8CjytM/yeulN2naMVX9gYOTtL/pNU1P82FBJs81oHeQRbKuya4KR+IjmL5ZILqHy6SQ+BKmdUwkOoHoIN1nyewF2tFvyb0nV5t5TjXgThK9kFKa82Ogc0+bQgpY4Z0uzoX0tGTtZz4hKvBff/5QFNFrTfUCLWmosj69Dw25s/tSlc/a4CStg6i2j/vjl/A1UH9kIlU1IEKPvVa7zJIzvPneQ/oS6UyI6ljekoWzZaqbO0kNCN9x8qzIJRHcu54K1AXLxMKrzKHgeUvoVbDgOOnzYjZIyovM2lwR25KSSjMT6jT/W85GD1z5HKJI4LWKhgo0+4uKK4tcwqxbYbcwKsKHHvUURwpbzG+mzr4970o3y05EjBi8DGoEBoWQViXXaN44+FoLiJJHHiPESkR/Y5Ym+rZ2NSX0/5f68jlThdjhCUPiiGITYkFBXMzSo8AzjvHRc3G0h9tKABc/0oqdmxsvqqlHJgl1Yu4gWMozohBS6YEezfAXuwtWd14ZqxciIfA2zlYKkAlSHkjYj7lmSmqcCBKMKBAxHmb4dqrKsDTDZg5XnnSTe804bh8As1apdUupgOLDPMkcB2MFDa59SIw+fkNT26SxA==--hUERiL1TFWDDRGh+--vnszh4d4JCXSoHEB2w2WEA==
\ No newline at end of file
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 160ec55..80ba7fc 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -77,9 +77,7 @@ Rails.application.configure do
   config.action_mailer.perform_deliveries = true
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.perform_caching = false
-  config.action_mailer.default_url_options = {
-    host: Rails.application.credentials.domain,
-  }
+  config.action_mailer.default_url_options = { host: config.site_domain }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
diff --git a/config/initializers/action_mailer_smtp_settings.rb b/config/initializers/action_mailer_smtp_settings.rb
index e9dd416..42e8cb3 100644
--- a/config/initializers/action_mailer_smtp_settings.rb
+++ b/config/initializers/action_mailer_smtp_settings.rb
@@ -5,7 +5,7 @@
 ActionMailer::Base.smtp_settings = {
   user_name:            'apikey',
   password:             Rails.application.credentials.sendgrid_api_key,
-  domain:               Rails.application.credentials.domain,
+  domain:               Rails.application.config.site_domain,
   address:              'smtp.sendgrid.net',
   port:                 587,
   authentication:       :plain,
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 7a86201..71f3e9f 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -22,7 +22,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = "no-reply@#{Rails.application.credentials.domain}"
+  config.mailer_sender = "no-reply@#{Rails.application.config.site_domain}"
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'