aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Houston <robin@lenny.robin>2011-07-14 04:52:18 +0100
committerRobin Houston <robin@lenny.robin>2011-07-14 04:52:18 +0100
commit8a7c00b5cc7a36da5e52e61fa5d11daa6f5b18ef (patch)
tree63c54d69d7f4e433f39c66fab6a50641579868bd
parente5d6a6f2a91f9e268f19fbc533628fd0bdc252cb (diff)
parentb0e3f1e6f1147d65dd802d7a618f7e321b816acc (diff)
Merge branch 'master' into wdtk
-rw-r--r--config/general.yml-example7
1 files changed, 5 insertions, 2 deletions
diff --git a/config/general.yml-example b/config/general.yml-example
index cb10ea40e..8a4a0442e 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -56,8 +56,11 @@ ADMIN_PASSWORD: 'passwordx'
CONTACT_EMAIL: 'postmaster@localhost'
CONTACT_NAME: 'Alaveteli Webmaster'
-# The base URL for admin pages. You probably don't want to change this.
-ADMIN_BASE_URL: '/admin/'
+# The base URL for admin pages.
+# If not specified, it will default to the path to the admin controller,
+# which is usually what you want. It is useful in situations where admin
+# requests are proxied via a secure server, for example.
+# ADMIN_BASE_URL: '/admin/'
# Where /stylesheets sits under for admin pages. See asset_host in
# config/environment.rb. Can be full domain or relative path (not an