Commit 80ae984b authored by Joshua Lambert's avatar Joshua Lambert Committed by Achilleas Pipinellis

Improve wording for automatic license import

parent 161b8839
...@@ -49,16 +49,10 @@ Otherwise, you can: ...@@ -49,16 +49,10 @@ Otherwise, you can:
## Add your license at install time ## Add your license at install time
The license may be automatically injected during installation using one of A license can be automatically imported at install time, by placing a file named
two methods. `Gitlab.gitlab-license` in `/etc/gitlab/` for Omnibus, or `config/` for source installations.
The first requires a license file named `Gitlab.gitlab-release`. It is also possible to specify a custom location and filename for the license.
Place it in the `config/` directory if installing from source or in the
`/etc/gitlab/` directory if installing Omnibus.
The second allows the administrator to configure the location and
filename of the license.
Source installations should set the `GITLAB_LICENSE_FILE` environment Source installations should set the `GITLAB_LICENSE_FILE` environment
variable with the path to a valid GitLab Enterprise Edition license. variable with the path to a valid GitLab Enterprise Edition license.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment