kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'jl-improve-wording-license-docs' into 'master' 

Improve wording for automatic license import

See merge request gitlab-org/gitlab-ce!29330
This commit is contained in:
Achilleas Pipinellis 2019-06-11 16:55:38 +00:00
parent 161b8839ed 80ae984bc9
commit 94167e93a5
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/user/admin_area/license.md
View File

@ -49,16 +49,10 @@ Otherwise, you can:
## Add your license at install time
The license may be automatically injected during installation using one of
two methods.
A license can be automatically imported at install time, by placing a file named
`Gitlab.gitlab-license` in `/etc/gitlab/` for Omnibus, or `config/` for source installations.
The first requires a license file named `Gitlab.gitlab-release`.
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.
It is also possible to specify a custom location and filename for the license.
Source installations should set the `GITLAB_LICENSE_FILE` environment
variable with the path to a valid GitLab Enterprise Edition license.