diff --git a/.env.example b/.env.example index 89da072..9433ef6 100644 --- a/.env.example +++ b/.env.example @@ -5,7 +5,8 @@ # APP_DOMAIN should be something like compliments.dev # EMAIL_WHITELIST should be the email domain name # -# Don't include the port in this domain setting. +# Don't include the port, protocol or trailing slash in this domain setting. +# Example: pluralsight.com APP_DOMAIN= EMAIL_WHITELIST= diff --git a/config/environments/development.rb b/config/environments/development.rb index 3ed29d4..d7e69f4 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -41,5 +41,5 @@ config.action_mailer.delivery_method = :smtp config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 } - config.action_mailer.default_url_options = { host: ENV.fetch("APP_DOMAIN") } + config.action_mailer.default_url_options = { host: "http://#{ENV.fetch('APP_DOMAIN')}" } end diff --git a/config/environments/production.rb b/config/environments/production.rb index 385d5c4..0de2d70 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -87,5 +87,5 @@ :enable_starttls_auto => true } - config.action_mailer.default_url_options = { host: ENV.fetch("APP_DOMAIN") } + config.action_mailer.default_url_options = { host: "http://#{ENV.fetch('APP_DOMAIN')}" } end diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 3da6b1d..c535494 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,2 +1,2 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cookie_store, key: '_compliments_session', domain: ENV["APP_DOMAIN"].sub("http://", "").sub("/","") +Rails.application.config.session_store :cookie_store, key: '_compliments_session', domain: ENV["APP_DOMAIN"]