Permalink
Browse files

Merge pull request #68 from kete/rr/addfigaro

add hidden configs with figaro
  • Loading branch information...
eoinkelly committed Jan 5, 2015
2 parents 0fa7319 + 7f5b627 commit 4a33fd31d3049cddf5828102545cf19d61fa1f35
Showing with 16 additions and 4 deletions.
  1. +4 −0 .gitignore
  2. +5 −0 config/application.yml.example
  3. +1 −1 config/deploy.rb
  4. +6 −3 config/environments/production.rb
@@ -97,3 +97,7 @@ pickle-email-*.html


/database-backups

# Ignore application configuration
/config/application.yml

@@ -0,0 +1,5 @@
# Add application configuration variables here, as shown below.
#
# SMTP_USERNAME: username_string
# SMTP_PASSWORD: password_string

@@ -25,7 +25,7 @@
# set :pty, true

# set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
set :linked_files, %w{config/database.yml config/secrets.yml config/initializers/secret_token.rb}
set :linked_files, %w{config/database.yml config/secrets.yml config/initializers/secret_token.rb config/application.yml}

# Default value for linked_dirs is []
set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/audio public/documents public/image_files public/video public/system public/uploads}
@@ -67,7 +67,7 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify

config.action_mailer.default_url_options = { :host => 'kete2.rabid.co.nz' }
config.action_mailer.default_url_options = { :host => 'horowhenua.kete.net.nz' }
# ActionMailer Config
# Setup for production - deliveries, no errors raised
config.action_mailer.delivery_method = :smtp
@@ -76,12 +76,15 @@
config.action_mailer.default :charset => "utf-8"

config.action_mailer.smtp_settings = {
:address => 'changeme',
:address => 'smtp.mandrillapp.com',
:port => '587',
:authentication => :plain,
# Password is a custom generated API key for Mandrill. To inspect it,
# adjust it, or create a new key; login to the Mandrill web-portal and
# go to 'Settings'. Username is the login-email for Mandrill.
:user_name => ENV['SMTP_USERNAME'],
:password => ENV['SMTP_PASSWORD'],
:domain => 'kete2.rabid.org.nz',
:domain => 'horowhenua.kete.net.nz',
:enable_starttls_auto => true
}

0 comments on commit 4a33fd3

Please sign in to comment.