summaryrefslogtreecommitdiff
path: root/doc/install
diff options
context:
space:
mode:
authorRobert Marshall <rmarshall@gitlab.com>2019-05-07 18:53:25 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-05-07 18:53:25 +0000
commit92663f73235456c5872d9ca572e572134ed4d41c (patch)
treebe15590fe45bd5b6bb59301f1e78751c8c80c491 /doc/install
parent12752f3d15a7e47ae2f12cee5489542c57e4f28c (diff)
downloadgitlab-ce-92663f73235456c5872d9ca572e572134ed4d41c.tar.gz
Document EE License Auto Import During Install
- Document how to properly configure `GITLAB_LICENSE_FILE` environment variable in source and omnibus installations. Resolves: https://gitlab.com/gitlab-org/gitlab-ee/issues/10808 Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/installation.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 6c1ba7fee95..c694f0ed691 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -579,10 +579,10 @@ sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production force=yes
```
NOTE: **Note:**
-You can set the Administrator/root password and e-mail by supplying them in environmental variables, `GITLAB_ROOT_PASSWORD` and `GITLAB_ROOT_EMAIL` respectively, as seen below. If you don't set the password (and it is set to the default one), wait to expose GitLab to the public internet until the installation is done and you've logged into the server the first time. During the first login, you'll be forced to change the default password.
+You can set the Administrator/root password and e-mail by supplying them in environmental variables, `GITLAB_ROOT_PASSWORD` and `GITLAB_ROOT_EMAIL` respectively, as seen below. If you don't set the password (and it is set to the default one), wait to expose GitLab to the public internet until the installation is done and you've logged into the server the first time. During the first login, you'll be forced to change the default password. An Enterprise Edition license may also be installed at this time by supplying a full path in the `GITLAB_LICENSE_FILE` environment variable.
```sh
-sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PASSWORD=yourpassword GITLAB_ROOT_EMAIL=youremail
+sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PASSWORD=yourpassword GITLAB_ROOT_EMAIL=youremail GITLAB_LICENSE_FILE="/path/to/license"
```
### Secure secrets.yml