jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* refactor aws config options

Browse Source 
* fix aws calls in savedsearch
* remove unused scripts
This commit is contained in:
r888888888
2015-12-28 12:25:38 -08:00
parent 811a60bb9d
commit d5fa4b46e3
9 changed files with 108 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/initializers/z_action_mailer.rb
View File

@@ -1,8 +1,8 @@
if Danbooru.config.amazon_ses && Rails.env == "production"
if Danbooru.config.aws_ses_enabled? && Rails.env == "production"
Rails.application.config.action_mailer.smtp_settings = {
:address => Danbooru.config.amazon_ses[:smtp_server_name],
:user_name => Danbooru.config.amazon_ses[:ses_smtp_user_name],
:password => Danbooru.config.amazon_ses[:ses_smtp_password],
:address => Danbooru.config.aws_ses_options[:smtp_server_name],
:user_name => Danbooru.config.aws_ses_options[:ses_smtp_user_name],
:password => Danbooru.config.aws_ses_options[:ses_smtp_password],
:authentication => :login,
:enable_starttls_auto => true
}