Skip to content

Commit f8e7613

Browse files
Russell Dickensonereadaxilleas
committed
Merge branch 'axil-init-passwd' into 'master'
SSoT for initial root password See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7064 Merged-by: Russell Dickenson <[email protected]> Approved-by: Evan Read <[email protected]> Approved-by: Russell Dickenson <[email protected]> Co-authored-by: Evan Read <[email protected]> Co-authored-by: Achilleas Pipinellis <[email protected]>
2 parents ac4755b + 41c9789 commit f8e7613

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

doc/installation/index.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,16 @@ To provide a custom initial root password, you have two options:
5959

6060
- Pass the `GITLAB_ROOT_PASSWORD` environment variable to the
6161
[installation command](https://about.gitlab.com/install/) provided
62-
the hostname for the server is set up correctly.
62+
the hostname for the server is set up correctly:
63+
64+
```shell
65+
sudo GITLAB_ROOT_PASSWORD="<strongpassword>" EXTERNAL_URL="http://gitlab.example.com" apt install gitlab-ee
66+
```
67+
6368
If during the installation GitLab doesn't automatically perform a
6469
reconfigure, you have to pass the `GITLAB_ROOT_PASSWORD` variable to the
6570
first `gitlab-ctl reconfigure` run.
71+
6672
- Before the first reconfigure, edit `/etc/gitlab/gitlab.rb` (create it if it
6773
doesn't exist) and set:
6874

doc/settings/configuration.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -693,12 +693,8 @@ To add a CSP:
693693

694694
## Set initial root password on installation
695695

696-
The initial password for the administrator user `root` can be set at the installation time
697-
with the `GITLAB_ROOT_PASSWORD` environment variable:
698-
699-
```shell
700-
sudo GITLAB_ROOT_PASSWORD="<strongpassword>" EXTERNAL_URL="http://gitlab.example.com" apt install gitlab-ee
701-
```
696+
The initial password for the administrator user `root` can be set at installation time. For more information, see
697+
[Set up the initial password](../installation/index.md#set-up-the-initial-password).
702698

703699
## Set allowed hosts to prevent host header attacks
704700

0 commit comments

Comments
 (0)