diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-04 12:37:53 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-04 12:37:53 +0100 |
| commit | 33cf36a3dfafe64bd721e0627e2a99b56a94238c (patch) | |
| tree | ad203ab96bdaa537ec44b6874b359aad4adcdc08 /config | |
| parent | b6231086aa895c83bfeb1cc7067725a9b96e8d0d (diff) | |
| parent | 772af44350723936778abe45e888b2fac36da726 (diff) | |
Merge remote-tracking branch 'henare_github/full-url-in-admin-emails' into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/general.yml-example | 3 | ||||
| -rw-r--r-- | config/test.yml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config/general.yml-example b/config/general.yml-example index 97af5f61d..b457b5ed6 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -83,7 +83,8 @@ TRACK_SENDER_NAME: 'Alaveteli Webmaster' # this up! RAW_EMAILS_LOCATION: 'files/raw_emails' -# The base URL for admin pages. +# The base URL for admin pages, must always end with a '/' +# e.g. https://www.example.com/secure/alaveteli-admin/ # 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. diff --git a/config/test.yml b/config/test.yml index 5811b1785..ef270dcf2 100644 --- a/config/test.yml +++ b/config/test.yml @@ -72,7 +72,7 @@ CONTACT_NAME: 'Alaveteli Webmaster' RAW_EMAILS_LOCATION: 'files/raw_emails' # The base URL for admin pages. You probably don't want to change this. -ADMIN_BASE_URL: '/admin/' +ADMIN_BASE_URL: '' # Where /stylesheets sits under for admin pages. See asset_host in # config/environment.rb. Can be full domain or relative path (not an @@ -125,4 +125,4 @@ EXCEPTION_NOTIFICATIONS_TO: MAX_REQUESTS_PER_USER_PER_DAY: 2 VARNISH_HOST: varnish.localdomain -SKIP_ADMIN_AUTH: true
\ No newline at end of file +SKIP_ADMIN_AUTH: true |