diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 15:06:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 15:06:05 +0000 |
| commit | 5c521d1f9b1e389e2f9b2b5fccf3798159a10f8d (patch) | |
| tree | 2460d9f5229b4b42b117b33584276d1040e2803c /doc/administration | |
| parent | 6cdc0f32fabea92606c8cda040a3d0875914b906 (diff) | |
| download | gitlab-ce-5c521d1f9b1e389e2f9b2b5fccf3798159a10f8d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/high_availability/consul.md | 2 | ||||
| -rw-r--r-- | doc/administration/high_availability/gitlab.md | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/administration/high_availability/consul.md b/doc/administration/high_availability/consul.md index aacc2c5cc40..b01419200cc 100644 --- a/doc/administration/high_availability/consul.md +++ b/doc/administration/high_availability/consul.md @@ -158,7 +158,7 @@ To fix this: ### Outage recovery -If you lost enough server agents in the cluster to break quorum, then the cluster is considered failed, and it will not function without manual intervenetion. +If you lost enough server agents in the cluster to break quorum, then the cluster is considered failed, and it will not function without manual intervention. #### Recreate from scratch diff --git a/doc/administration/high_availability/gitlab.md b/doc/administration/high_availability/gitlab.md index 0a8343605eb..71ab169a801 100644 --- a/doc/administration/high_availability/gitlab.md +++ b/doc/administration/high_availability/gitlab.md @@ -99,14 +99,14 @@ these additional steps before proceeding with GitLab installation. ## First GitLab application server -As a final step, run the setup rake task **only on** the first GitLab application server. -Do not run this on additional application servers. +On the first application server, run: -1. Initialize the database by running `sudo gitlab-rake gitlab:setup`. -1. Run `sudo gitlab-ctl reconfigure` to compile the configuration. +```sh +sudo gitlab-ctl reconfigure +``` - CAUTION: **WARNING:** Only run this setup task on **NEW** GitLab instances because it - will wipe any existing data. +This should compile the configuration and initialize the database. Do +not run this on additional application servers until the next step. ## Extra configuration for additional GitLab application servers |