diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-02 09:49:31 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-02 09:49:31 +0100 |
| commit | a244afcb7b7185905a7a16b37ae585e239e963ea (patch) | |
| tree | f9304719d3639fc444ade1e832abc438b8fa363e /config | |
| parent | 29614bf3790b6678fa074b57e210d7d629512ed3 (diff) | |
| parent | e6f59296a3e89276a3c9511ec61023d0f54c27e3 (diff) | |
Merge branch 'hotfix/0.8.0.1' into wdtk
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 3 | ||||
| -rw-r--r-- | config/test.yml | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config/environment.rb b/config/environment.rb index fae6405c4..8a5c7a605 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -116,6 +116,9 @@ end # Domain for URLs (so can work for scripts, not just web pages) ActionMailer::Base.default_url_options[:host] = Configuration::domain +if Configuration::force_ssl + ActionMailer::Base.default_url_options[:protocol] = "https" +end # fallback locale and available locales available_locales = Configuration::available_locales.split(/ /) diff --git a/config/test.yml b/config/test.yml index f40b11764..bc9ec099a 100644 --- a/config/test.yml +++ b/config/test.yml @@ -13,6 +13,11 @@ SITE_NAME: 'Alaveteli' # It makes things simpler if this is the same as the Rails test domain test.host DOMAIN: 'test.host' +# If true forces everyone (in the production environment) to use encrypted connections +# (via https) by redirecting unencrypted connections. This is *highly* recommended +# so that logins can't be intercepted by naughty people. +FORCE_SSL: false + # ISO country code of country currrently deployed in # (http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) ISO_COUNTRY_CODE: DE |