diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-15 20:10:50 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-15 20:10:50 +0000 |
| commit | 50542cd3fe8fe2308ca08a388bbb26244ff06e0b (patch) | |
| tree | c2b19fe5df8e7b0571d4a18bbd2c9a4239a831ad | |
| parent | e5d5b43ceba1e68d00bfd586e83875e76f4b2bbe (diff) | |
| parent | 3a9401657d17012f2ae43cf3b1154fea9d133007 (diff) | |
| download | gitlab-ce-50542cd3fe8fe2308ca08a388bbb26244ff06e0b.tar.gz | |
Merge branch 'sh-support-cdns' into 'master'
Support a configurable Rails asset_host to allow for CDNs
See merge request !12102
| -rw-r--r-- | config/environments/production.rb | 2 | ||||
| -rw-r--r-- | doc/administration/environment_variables.md | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 82a19085b1d..c5cbfcf64cf 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -50,7 +50,7 @@ Rails.application.configure do # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) # Enable serving of images, stylesheets, and JavaScripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" + config.action_controller.asset_host = ENV['GITLAB_CDN_HOST'] if ENV['GITLAB_CDN_HOST'].present? # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) # config.assets.precompile += %w( search.js ) diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md index b6676026d06..9bcd13a52f7 100644 --- a/doc/administration/environment_variables.md +++ b/doc/administration/environment_variables.md @@ -13,6 +13,7 @@ override certain values. Variable | Type | Description -------- | ---- | ----------- +`GITLAB_CDN_HOST` | string | Sets the hostname for a CDN to serve static assets (e.g. `mycdnsubdomain.fictional-cdn.com`) `GITLAB_ROOT_PASSWORD` | string | Sets the password for the `root` user on installation `GITLAB_HOST` | string | The full URL of the GitLab server (including `http://` or `https://`) `RAILS_ENV` | string | The Rails environment; can be one of `production`, `development`, `staging` or `test` @@ -58,6 +59,9 @@ to the naming scheme `GITLAB_#{name in 1_settings.rb in upper case}`. ## Omnibus configuration +To set environment variables, follow [these +instructions](https://docs.gitlab.com/omnibus/settings/environment-variables.html). + It's possible to preconfigure the GitLab docker image by adding the environment variable `GITLAB_OMNIBUS_CONFIG` to the `docker run` command. For more information see the ['preconfigure-docker-container' section in the Omnibus documentation](http://docs.gitlab.com/omnibus/docker/#preconfigure-docker-container). |