aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/general.yml-example5
-rw-r--r--config/test.yml3
2 files changed, 6 insertions, 2 deletions
diff --git a/config/general.yml-example b/config/general.yml-example
index 98f04d0bf..ed04e0fd5 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -92,7 +92,10 @@ COOKIE_STORE_SESSION_SECRET: 'your secret key here, make it long and random'
# checks in a few obvious places.
READ_ONLY: ''
-# Doesn't do anything right now.
+# Is this a staging or dev site (1) or a live site (0).
+# Controls whether or not the rails-post-deploy script
+# will create the file config/rails_env.rb file to force
+# Rails into production environment.
STAGING_SITE: 1
# Recaptcha, for detecting humans. Get keys here: http://recaptcha.net/whyrecaptcha.html
diff --git a/config/test.yml b/config/test.yml
index 6a423b47a..90689395a 100644
--- a/config/test.yml
+++ b/config/test.yml
@@ -10,7 +10,8 @@
SITE_NAME: 'Alaveteli'
# Domain used in URLs generated by scripts (e.g. for going in some emails)
-DOMAIN: 'test.localdomain'
+# It makes things simpler if this is the same as the Rails test domain test.host
+DOMAIN: 'test.host'
# ISO country code of country currrently deployed in
# (http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)