Skip to content

Commit

Permalink
#9 Setup mailchimp settings
Browse files Browse the repository at this point in the history
  • Loading branch information
Onur Ozgur OZKAN committed Sep 5, 2013
1 parent a7f31ef commit a9663dc
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,20 @@ public/system
tags
vendor/bundler_gems

# Ignore ide and text editor
.idea

# Ignore pow files
.powrc

# Ignore mac files
.DS_Store

# Ignore config files
config/settings.local.yml
config/settings/*.local.yml
config/environments/*.local.yml

.rvmrc

# Ignore ide and text editor
.idea
.idea/
.idea/**/*
4 changes: 1 addition & 3 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
# number of complex assets.
config.assets.debug = true

# Mail Setting
# Mail Setting
config.action_mailer.default_url_options = { :host => 'yakut.dev' }


config.action_mailer.delivery_method = :letter_opener
end
16 changes: 4 additions & 12 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,10 @@
# Use default logging formatter so that PID and timestamp are not suppressed.
config.log_formatter = ::Logger::Formatter.new

# Mail Setting
config.action_mailer.default_url_options = { :host => 'yakut.com' }


# Mail Setting
config.action_mailer.default_url_options = {host: 'yakut.com'}
config.action_mailer.raise_delivery_errors = false
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = {
:address => 'smtp.mandrillapp.com',
:port => 587,
:enable_starttls_auto => true,
:user_name => 'email@email.com', #TODO change this with original
:password => 'password', #TODO change this with original
:authentication => 'plain'
}
config.action_mailer.smtp_settings = Settings.smtp.mandrill

end
8 changes: 8 additions & 0 deletions config/settings/production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
smtp:
mandrill:
address: 'smtp.mandrillapp.com'
port: 587
enable_starttls_auto: true
user_name: 'email@email.com'
password: 'password'
authentication: 'plain'

1 comment on commit a9663dc

@baygunm
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Please sign in to comment.