aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/environment.rb3
-rw-r--r--config/test.yml5
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