more sensible mailer option defaults

Conflicts:
	app/mailers/base_mailer.rb
	config/app_config.yml.SAMPLE
	spec/app_config.yml

config/environments/development.rb.SAMPLE

@@ -33,8 +33,8 @@ Foodsoft::Application.configure do
   # Required for i18n-js
   config.assets.initialize_on_precompile = true
 
-  # Configure hostname for action mailer
-  config.action_mailer.default_url_options = { host: 'localhost:3000' }
+  # Configure hostname for action mailer (can be overridden in foodcoop config)
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000, protocol: 'http' }
 
   # Mailcatcher config, start mailcatcher from console with 'mailcatcher'
   # Mailcatcher can be installed by gem install mailcatcher

config/environments/production.rb

@@ -75,6 +75,9 @@ Foodsoft::Application.configure do
   # Disable automatic flushing of the log to improve performance.
   # config.autoflush_log = false
 
+  # Configure hostname for action mailer (can be overridden in foodcoop config)
+  config.action_mailer.default_url_options = { host: `hostname -f`, protocol: 'https' }
+
   # Use sendmail to avoid ssl cert problems
   config.action_mailer.delivery_method = :sendmail
 

config/environments/test.rb

@@ -29,6 +29,9 @@ Foodsoft::Application.configure do
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
+  # Configure hostname for action mailer (can be overridden in foodcoop config)
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000, protocol: 'http' }
+
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.