Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
38ed0b53
Commit
38ed0b53
authored
Jun 15, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename CDN_HOST to GITLAB_CDN_HOST
parent
203b49d2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
config/environments/production.rb
config/environments/production.rb
+1
-1
doc/administration/environment_variables.md
doc/administration/environment_variables.md
+1
-1
No files found.
config/environments/production.rb
View file @
38ed0b53
...
...
@@ -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
=
ENV
[
'
CDN_HOST'
]
if
ENV
[
'
CDN_HOST'
].
present?
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 )
...
...
doc/administration/environment_variables.md
View file @
38ed0b53
...
...
@@ -13,7 +13,7 @@ override certain values.
Variable | Type | Description
-------- | ---- | -----------
`
CDN_HOST`
| string | Sets the hostname for a CDN to serve static assets (e.g.
`mycdnsubdomain.fictional-cdn.com`
)
`
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`
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment