diff options
| -rw-r--r-- | config/environments/production.rb | 38 | ||||
| -rw-r--r-- | config/secrets.yml | 12 |
2 files changed, 17 insertions, 33 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index e734a8573..bdfc955f6 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -84,35 +84,19 @@ Rails.application.configure do config.active_record.dump_schema_after_migration = false - if ENV['CHOUETTE_BASE_URL'].nil? - config.action_mailer.default_url_options = { :host => 'my-domain-name.com' } - else - config.action_mailer.default_url_options = { :host => ENV['CHOUETTE_BASE_URL'] } - end + config.action_mailer.default_url_options = { :host => 'my-domain-name.com' } # Configure the e-mail address which will be shown in Devise::Maile - if ENV['CHOUETTE_MAIL_SENDER'].nil? - config.mailer_sender = "chouette-production@my-domain-name.com" - else - config.mailer_sender = ENV['CHOUETTE_MAIL_SENDER'] - end + config.mailer_sender = "chouette-production@my-domain-name.com" - #if mailer == "smtp" - if ENV['CHOUETTE_SMTP_USER'].nil? - ActionMailer::Base.smtp_settings = { - :address => ENV['CHOUETTE_SMTP_ADDRESS'].nil? ? "smtp.sample.com" : ENV['CHOUETTE_SMTP_ADDRESS'], - :port => ENV['CHOUETTE_SMTP_PORT'].nil? ? 25 : ENV['CHOUETTE_SMTP_PORT'].to_i, - :domain => ENV['CHOUETTE_SMTP_DOMAIN'].nil? ? "sample.com" : ENV['CHOUETTE_SMTP_DOMAIN'] } - else - ActionMailer::Base.smtp_settings = { - :address => ENV['CHOUETTE_SMTP_ADDRESS'], - :port => ENV['CHOUETTE_SMTP_PORT'].nil? ? 25 : ENV['CHOUETTE_SMTP_PORT'].to_i, - :domain => ENV['CHOUETTE_SMTP_DOMAIN'], - :user_name => ENV['CHOUETTE_SMTP_USER'], - :password => ENV['CHOUETTE_SMTP_PASSWORD'], - :authentication => ENV['CHOUETTE_SMTP_AUTH'] } - end - #end + ActionMailer::Base.smtp_settings = { + :address => "smtp.sample.com", + :port => 25, + :domain => "sample.com", + :user_name => "smtp_user", + :password => "smtp_password", + :authentication => :login + } # Specific theme for each company # AFIMB @@ -128,7 +112,7 @@ Rails.application.configure do # config.accept_user_creation = false # file to data for demo - config.demo_data = ENV['CHOUETTE_DEMO_DATA'].nil? ? "/path/to/demo.zip" : ENV['CHOUETTE_DEMO_DATA'] + # config.demo_data = "/path/to/demo.zip" # link to validation specification pages config.validation_spec = "http://www.chouette.mobi/neptune-validation/v21/" diff --git a/config/secrets.yml b/config/secrets.yml index be613cbea..3f38dd3e7 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -14,18 +14,18 @@ development: secret_key_base: e901adb90fc1fff22f7237d138ef232a5425b67e81ccb3ce7003aab2c002d35a7c3d593c0fca3dcb21e8c911a8260c984a830d1d61776ad3005eb373abebc695 api_endpoint: "http://localhost:8080/chouette_iev/" google_analytic_tracker: "UA-AAAAAAAA" - geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa" + # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa" test: secret_key_base: 54f61aab23322611dd0bbf73b7f034db34281f7f4b3c4992eaaff20ecc9673bbd467beaa6fcb48379ca69b80bc5662deac4e33ca144f2482146123d3e966016a api_endpoint: "http://localhost:8080/chouette_iev/" google_analytic_tracker: "UA-AAAAAAAA" - geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa" + # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa" # Do not keep production secrets in the repository, # instead read values from the environment. production: - secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> - api_endpoint: <%= ENV["API_ENDPOINT"] %> - google_analytic_tracker: <%= ENV['GOOGLE_ANALYTIC_TRACKER'] %> - geoportail_api_key: <%= ENV['GEOPORTAIL_API_KEY'] %> + secret_key_base: 54f61aab23322611dd0bbf73b7f034db34281f7f4b3c4992eaaff20ecc9673bbd467beaa6fcb48379ca69b80bc5662deac4e33ca144f2482146123d3e966016a + api_endpoint: "http://localhost:8080/chouette_iev/" + google_analytic_tracker: "UA-AAAAAAAA" + # geoportail_api_key: "aaaaaaaaaaaaaaaaaaaaaa" |