summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-12-23 14:44:15 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-12-23 14:44:15 +0000
commit91bb99502958a1cd468ad9a7e88db76ccb03f1d6 (patch)
tree6509969784555fb2a2cc1dc591772faa461375d2
parenteb02ef47ae2e7e5da3057c0b06e7a952c123b413 (diff)
parentb5d0f90e3047676f4e129ed4cd2732b6c5a7a3eb (diff)
downloadgitlab-ce-91bb99502958a1cd468ad9a7e88db76ccb03f1d6.tar.gz
Merge branch 'note-env-variables-in-installation' into 'master'
Note env variables in installation See merge request !1342
-rw-r--r--doc/install/installation.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index aa04116779e..d987e11040b 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -294,9 +294,9 @@ GitLab Shell is an SSH access and repository management software developed speci
# When done you see 'Administrator account created:'
-**Note:** You can set the Administrator password by supplying it in environmental variable `GITLAB_ROOT_PASSWORD`, eg.:
+**Note:** You can set the Administrator/root password by supplying it in environmental variable `GITLAB_ROOT_PASSWORD` as seen below. If you don't set the password (and it is set to the default one) please wait with exposing 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.
- sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PASSWORD=newpassword
+ sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PASSWORD=yourpassword
### Install Init Script
@@ -388,7 +388,7 @@ Visit YOUR_SERVER in your web browser for your first GitLab login. The setup has
root
5iveL!fe
-**Important Note:** Please login to the server before exposing it to the public internet. On login you'll be prompted to change the password.
+**Important Note:** On login you'll be prompted to change the password.
**Enjoy!**