more sensible mailer option defaults

Conflicts:
	app/mailers/base_mailer.rb
	config/app_config.yml.SAMPLE
	spec/app_config.yml
This commit is contained in:
wvengen 2014-09-02 12:18:50 +02:00
parent ecf5601023
commit 63d52db91b
6 changed files with 17 additions and 11 deletions

View file

@ -8,12 +8,6 @@ default: &defaults
# If multi_coop_install you have to use a coop name, which you you wanna be selected by default
default_scope: 'f'
# http config for this host
# Required for action mailer
protocol: http
host: localhost
port: 3000
# name of this foodcoop
name: FC Test
# foodcoop contact information (used for FAX messages)
@ -106,6 +100,11 @@ default: &defaults
sender_address: "\"Foodsoft Error\" <foodsoft@foodcoop.test>"
email_prefix: "[Foodsoft]"
# http config for this host to generate links in emails (uses environment config when not set)
#protocol: http
#host: localhost
#port: 3000
# Access to sharedLists, the external article-database
shared_lists:
adapter: mysql2