Merge pull request #67 from CLOSER-Cohorts/hotfix_email-less-setup

Initial setup bugfixes
CLOSER-Cohorts · Aug 3, 2016 · e0b8267 · e0b8267
2 parents 4e154d6 + 7adb67e
commit e0b8267
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -34,6 +34,7 @@ def setup
           u.group = g
           u.save!
           u.admin!
+          u.confirm
         end
 
       end

diff --git a/config/application.rb b/config/application.rb
@@ -32,8 +32,8 @@ class Application < Rails::Application
     config.autoload_paths += %W(#{config.root}/lib)
 
     config.action_mailer.delivery_method = :postmark
-    config.action_mailer.postmark_settings = { :api_token => ENV['POSTMARK_API_KEY'] }
-    config.action_mailer.default_url_options = {host: 'archivist.closer.ac.uk'}
+    config.action_mailer.postmark_settings = { api_token: ENV['POSTMARK_API_KEY'] }
+    config.action_mailer.default_url_options = {host: (ENV['HOSTNAME'] || 'localhost')}
 
     config.after_initialize do
       begin

diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
@@ -1,4 +1,4 @@
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+Rails.application.config.filter_parameters += [:password, :confirm]