diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-11 16:55:38 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-11 16:55:38 +0000 |
| commit | 94167e93a546d2869c60a2e39cad0875540ef001 (patch) | |
| tree | 05ab237377c69edf684fabc9af24d72bdd4e173f | |
| parent | 161b8839edec281d1c4215bc47b5623cca797e45 (diff) | |
| parent | 80ae984bc91ffe60838f069c698e25958131d30e (diff) | |
| download | gitlab-ce-94167e93a546d2869c60a2e39cad0875540ef001.tar.gz | |
Merge branch 'jl-improve-wording-license-docs' into 'master'
Improve wording for automatic license import
See merge request gitlab-org/gitlab-ce!29330
| -rw-r--r-- | doc/user/admin_area/license.md | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/doc/user/admin_area/license.md b/doc/user/admin_area/license.md index 1e8ce04da92..8ddb9c3d707 100644 --- a/doc/user/admin_area/license.md +++ b/doc/user/admin_area/license.md @@ -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. |