Skip to content

G
gitlab-ce
Commit 7ec1b0ac authored by Craig Norris's avatar Craig Norris Committed by Amy Qualls
Browse files
Options

Docs: Update RA pages with standard Omnibus installation instructions

parent c88b4287
Show whitespace changes
Inline Side-by-side
Showing with 232 additions and 305 deletions
doc/administration/reference_architectures/10k_users.md
View file @ 7ec1b0ac
...@@ -248,14 +248,11 @@ with the other servers. ...@@ -248,14 +248,11 @@ with the other servers.
To configure Consul: To configure Consul:
1. SSH into the server that will host Consul. 1. SSH in to the server that will host Consul.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus GitLab package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -352,7 +349,7 @@ in the second step, do not supply the `EXTERNAL_URL` value. ...@@ -352,7 +349,7 @@ in the second step, do not supply the `EXTERNAL_URL` value.
#### PostgreSQL primary node #### PostgreSQL primary node
1. SSH into the PostgreSQL primary node. 1. SSH in to the PostgreSQL primary node.
1. Generate a password hash for the PostgreSQL username/password pair. This assumes you will use the default 1. Generate a password hash for the PostgreSQL username/password pair. This assumes you will use the default
username of `gitlab` (recommended). The command will request a password username of `gitlab` (recommended). The command will request a password
and confirmation. Use the value that is output by this command in the next and confirmation. Use the value that is output by this command in the next
...@@ -513,7 +510,7 @@ are supported and can be added if needed. ...@@ -513,7 +510,7 @@ are supported and can be added if needed.
#### PostgreSQL post-configuration #### PostgreSQL post-configuration
SSH into the **primary node**: SSH in to the **primary node**:
1. Open a database prompt: 1. Open a database prompt:
...@@ -548,7 +545,7 @@ SSH into the **primary node**: ...@@ -548,7 +545,7 @@ SSH into the **primary node**:
is not an IP address, it will need to be a resolvable name (via DNS or is not an IP address, it will need to be a resolvable name (via DNS or
`/etc/hosts`) `/etc/hosts`)
SSH into the **secondary node**: SSH in to the **secondary node**:
1. Set up the repmgr standby: 1. Set up the repmgr standby:
...@@ -815,13 +812,11 @@ a node and change its status from primary to replica (and vice versa). ...@@ -815,13 +812,11 @@ a node and change its status from primary to replica (and vice versa).
#### Configure the primary Redis Cache node #### Configure the primary Redis Cache node
1. SSH into the **Primary** Redis server. 1. SSH in to the **Primary** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -871,13 +866,11 @@ You can specify multiple roles, like sentinel and Redis, as: ...@@ -871,13 +866,11 @@ You can specify multiple roles, like sentinel and Redis, as:
#### Configure the replica Redis Cache nodes #### Configure the replica Redis Cache nodes
1. SSH into the **replica** Redis server. 1. SSH in to the **replica** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -965,14 +958,11 @@ clients to report `NOAUTH Authentication required.`. ...@@ -965,14 +958,11 @@ clients to report `NOAUTH Authentication required.`.
To configure the Sentinel Cache server: To configure the Sentinel Cache server:
1. SSH into the server that will host Consul/Sentinel. 1. SSH in to the server that will host Consul/Sentinel.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus GitLab package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1081,13 +1071,11 @@ a node and change its status from primary to replica (and vice versa). ...@@ -1081,13 +1071,11 @@ a node and change its status from primary to replica (and vice versa).
#### Configure the primary Redis Queues node #### Configure the primary Redis Queues node
1. SSH into the **Primary** Redis server. 1. SSH in to the **Primary** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1142,13 +1130,11 @@ You can specify multiple roles, like sentinel and Redis, as: ...@@ -1142,13 +1130,11 @@ You can specify multiple roles, like sentinel and Redis, as:
#### Configure the replica Redis Queues nodes #### Configure the replica Redis Queues nodes
1. SSH into the **replica** Redis Queue server. 1. SSH in to the **replica** Redis Queue server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1236,14 +1222,11 @@ clients to report `NOAUTH Authentication required.`. ...@@ -1236,14 +1222,11 @@ clients to report `NOAUTH Authentication required.`.
To configure the Sentinel Queues server: To configure the Sentinel Queues server:
1. SSH into the server that will host Sentinel. 1. SSH in to the server that will host Sentinel.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus GitLab package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1402,8 +1385,8 @@ and that your GitLab installation has three repository storages: ...@@ -1402,8 +1385,8 @@ and that your GitLab installation has three repository storages:
On each node: On each node:
1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want (based on _steps 1 and 2_ on the GitLab downloads page), but package of your choice. Be sure to follow _only_ installation steps 1 and 2
_without_ providing the `EXTERNAL_URL` value. on the page, and _do not_ provide the `EXTERNAL_URL` value.
1. Edit `/etc/gitlab/gitlab.rb` to configure the storage paths, enable 1. Edit `/etc/gitlab/gitlab.rb` to configure the storage paths, enable
the network listener, and configure the token: the network listener, and configure the token:
...@@ -1565,10 +1548,10 @@ The following IPs will be used as an example: ...@@ -1565,10 +1548,10 @@ The following IPs will be used as an example:
To configure the Sidekiq nodes, on each one: To configure the Sidekiq nodes, on each one:
1. SSH into the Sidekiq server. 1. SSH in to the Sidekiq server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab package 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
you want using steps 1 and 2 from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
**Do not complete any other steps on the download page.** on the page.
1. Open `/etc/gitlab/gitlab.rb` with your editor: 1. Open `/etc/gitlab/gitlab.rb` with your editor:
```ruby ```ruby
...@@ -1702,10 +1685,9 @@ The following IPs will be used as an example: ...@@ -1702,10 +1685,9 @@ The following IPs will be used as an example:
On each node perform the following: On each node perform the following:
1. Download and install Omnibus GitLab using **steps 1 and 2** from 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
[GitLab downloads](https://about.gitlab.com/install/). Do not complete other package of your choice. Be sure to follow _only_ installation steps 1 and 2
steps on the download page. on the page.
1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace 1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace
the file of the same name on this server. If that file is not on this server, the file of the same name on this server. If that file is not on this server,
add the file from your Consul server to this server. add the file from your Consul server to this server.
...@@ -1905,11 +1887,10 @@ The following IP will be used as an example: ...@@ -1905,11 +1887,10 @@ The following IP will be used as an example:
To configure the Monitoring node: To configure the Monitoring node:
1. SSH into the Monitoring node. 1. SSH in to the Monitoring node.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
Do not complete any other steps on the download page. on the page.
1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace 1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace
the file of the same name on this server. If that file is not on this server, the file of the same name on this server. If that file is not on this server,
add the file from your Consul server to this server. add the file from your Consul server to this server.
......
doc/administration/reference_architectures/25k_users.md
View file @ 7ec1b0ac
...@@ -248,14 +248,11 @@ with the other servers. ...@@ -248,14 +248,11 @@ with the other servers.
To configure Consul: To configure Consul:
1. SSH into the server that will host Consul. 1. SSH in to the server that will host Consul.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus GitLab package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -352,7 +349,7 @@ in the second step, do not supply the `EXTERNAL_URL` value. ...@@ -352,7 +349,7 @@ in the second step, do not supply the `EXTERNAL_URL` value.
#### PostgreSQL primary node #### PostgreSQL primary node
1. SSH into the PostgreSQL primary node. 1. SSH in to the PostgreSQL primary node.
1. Generate a password hash for the PostgreSQL username/password pair. This assumes you will use the default 1. Generate a password hash for the PostgreSQL username/password pair. This assumes you will use the default
username of `gitlab` (recommended). The command will request a password username of `gitlab` (recommended). The command will request a password
and confirmation. Use the value that is output by this command in the next and confirmation. Use the value that is output by this command in the next
...@@ -513,7 +510,7 @@ are supported and can be added if needed. ...@@ -513,7 +510,7 @@ are supported and can be added if needed.
#### PostgreSQL post-configuration #### PostgreSQL post-configuration
SSH into the **primary node**: SSH in to the **primary node**:
1. Open a database prompt: 1. Open a database prompt:
...@@ -548,7 +545,7 @@ SSH into the **primary node**: ...@@ -548,7 +545,7 @@ SSH into the **primary node**:
is not an IP address, it will need to be a resolvable name (via DNS or is not an IP address, it will need to be a resolvable name (via DNS or
`/etc/hosts`) `/etc/hosts`)
SSH into the **secondary node**: SSH in to the **secondary node**:
1. Set up the repmgr standby: 1. Set up the repmgr standby:
...@@ -815,13 +812,11 @@ a node and change its status from primary to replica (and vice versa). ...@@ -815,13 +812,11 @@ a node and change its status from primary to replica (and vice versa).
#### Configure the primary Redis Cache node #### Configure the primary Redis Cache node
1. SSH into the **Primary** Redis server. 1. SSH in to the **Primary** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -871,13 +866,11 @@ You can specify multiple roles, like sentinel and Redis, as: ...@@ -871,13 +866,11 @@ You can specify multiple roles, like sentinel and Redis, as:
#### Configure the replica Redis Cache nodes #### Configure the replica Redis Cache nodes
1. SSH into the **replica** Redis server. 1. SSH in to the **replica** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -965,14 +958,11 @@ clients to report `NOAUTH Authentication required.`. ...@@ -965,14 +958,11 @@ clients to report `NOAUTH Authentication required.`.
To configure the Sentinel Cache server: To configure the Sentinel Cache server:
1. SSH into the server that will host Consul/Sentinel. 1. SSH in to the server that will host Consul/Sentinel.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus GitLab package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1081,13 +1071,11 @@ a node and change its status from primary to replica (and vice versa). ...@@ -1081,13 +1071,11 @@ a node and change its status from primary to replica (and vice versa).
#### Configure the primary Redis Queues node #### Configure the primary Redis Queues node
1. SSH into the **Primary** Redis server. 1. SSH in to the **Primary** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1142,13 +1130,11 @@ You can specify multiple roles, like sentinel and Redis, as: ...@@ -1142,13 +1130,11 @@ You can specify multiple roles, like sentinel and Redis, as:
#### Configure the replica Redis Queues nodes #### Configure the replica Redis Queues nodes
1. SSH into the **replica** Redis Queue server. 1. SSH in to the **replica** Redis Queue server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1236,14 +1222,11 @@ clients to report `NOAUTH Authentication required.`. ...@@ -1236,14 +1222,11 @@ clients to report `NOAUTH Authentication required.`.
To configure the Sentinel Queues server: To configure the Sentinel Queues server:
1. SSH into the server that will host Sentinel. 1. SSH in to the server that will host Sentinel.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1402,8 +1385,8 @@ and that your GitLab installation has three repository storages: ...@@ -1402,8 +1385,8 @@ and that your GitLab installation has three repository storages:
On each node: On each node:
1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want (based on _steps 1 and 2_ on the GitLab downloads page), but package of your choice. Be sure to follow _only_ installation steps 1 and 2
_without_ providing the `EXTERNAL_URL` value. on the page, and _do not_ provide the `EXTERNAL_URL` value.
1. Edit `/etc/gitlab/gitlab.rb` to configure the storage paths, enable 1. Edit `/etc/gitlab/gitlab.rb` to configure the storage paths, enable
the network listener, and configure the token: the network listener, and configure the token:
...@@ -1565,10 +1548,10 @@ The following IPs will be used as an example: ...@@ -1565,10 +1548,10 @@ The following IPs will be used as an example:
To configure the Sidekiq nodes, on each one: To configure the Sidekiq nodes, on each one:
1. SSH into the Sidekiq server. 1. SSH in to the Sidekiq server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab package 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
you want using steps 1 and 2 from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
**Do not complete any other steps on the download page.** on the page.
1. Open `/etc/gitlab/gitlab.rb` with your editor: 1. Open `/etc/gitlab/gitlab.rb` with your editor:
```ruby ```ruby
...@@ -1702,10 +1685,9 @@ The following IPs will be used as an example: ...@@ -1702,10 +1685,9 @@ The following IPs will be used as an example:
On each node perform the following: On each node perform the following:
1. Download and install Omnibus GitLab using **steps 1 and 2** from 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
[GitLab downloads](https://about.gitlab.com/install/). Do not complete other package of your choice. Be sure to follow _only_ installation steps 1 and 2
steps on the download page. on the page.
1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace 1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace
the file of the same name on this server. If that file is not on this server, the file of the same name on this server. If that file is not on this server,
add the file from your Consul server to this server. add the file from your Consul server to this server.
...@@ -1905,11 +1887,10 @@ The following IP will be used as an example: ...@@ -1905,11 +1887,10 @@ The following IP will be used as an example:
To configure the Monitoring node: To configure the Monitoring node:
1. SSH into the Monitoring node. 1. SSH in to the Monitoring node.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
Do not complete any other steps on the download page. on the page.
1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace 1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace
the file of the same name on this server. If that file is not on this server, the file of the same name on this server. If that file is not on this server,
add the file from your Consul server to this server. add the file from your Consul server to this server.
......
doc/administration/reference_architectures/2k_users.md
View file @ 7ec1b0ac
...@@ -207,10 +207,10 @@ further configuration steps. ...@@ -207,10 +207,10 @@ further configuration steps.
### Standalone PostgreSQL using Omnibus GitLab ### Standalone PostgreSQL using Omnibus GitLab
1. SSH into the PostgreSQL server. 1. SSH in to the PostgreSQL server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
- Do not complete any other steps on the download page. on the page.
1. Generate a password hash for PostgreSQL. This assumes you will use the default 1. Generate a password hash for PostgreSQL. This assumes you will use the default
username of `gitlab` (recommended). The command will request a password username of `gitlab` (recommended). The command will request a password
and confirmation. Use the value that is output by this command in the next and confirmation. Use the value that is output by this command in the next
...@@ -301,11 +301,10 @@ The Omnibus GitLab package can be used to configure a standalone Redis server. ...@@ -301,11 +301,10 @@ The Omnibus GitLab package can be used to configure a standalone Redis server.
The steps below are the minimum necessary to configure a Redis server with The steps below are the minimum necessary to configure a Redis server with
Omnibus: Omnibus:
1. SSH into the Redis server. 1. SSH in to the Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
- Do not complete any other steps on the download page. on the page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -394,12 +393,11 @@ The following procedure describes how to configure a single Gitaly server named ...@@ -394,12 +393,11 @@ The following procedure describes how to configure a single Gitaly server named
`gitaly1.internal` with the secret token `gitalysecret`. We assume your GitLab `gitaly1.internal` with the secret token `gitalysecret`. We assume your GitLab
installation has two repository storages: `default` and `storage1`. installation has two repository storages: `default` and `storage1`.
To configure the Gitaly server: To configure the Gitaly server, on the server node you want to use for Gitaly:
1. On the server node you want to use for Gitaly, 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
[download and install](https://about.gitlab.com/install/) your selected package of your choice. Be sure to follow _only_ installation steps 1 and 2
Omnibus GitLab package using *steps 1 and 2* from the GitLab downloads page, on the page, and _do not_ provide the `EXTERNAL_URL` value.
but *without* providing the `EXTERNAL_URL` value.
1. Edit the Gitaly server node's `/etc/gitlab/gitlab.rb` file to configure 1. Edit the Gitaly server node's `/etc/gitlab/gitlab.rb` file to configure
storage paths, enable the network listener, and to configure the token: storage paths, enable the network listener, and to configure the token:
...@@ -570,9 +568,9 @@ On each node perform the following: ...@@ -570,9 +568,9 @@ On each node perform the following:
mkdir -p /var/opt/gitlab/.ssh /var/opt/gitlab/gitlab-rails/uploads /var/opt/gitlab/gitlab-rails/shared /var/opt/gitlab/gitlab-ci/builds /var/opt/gitlab/git-data mkdir -p /var/opt/gitlab/.ssh /var/opt/gitlab/gitlab-rails/uploads /var/opt/gitlab/gitlab-rails/shared /var/opt/gitlab/gitlab-ci/builds /var/opt/gitlab/git-data
``` ```
1. Download and install Omnibus GitLab using **steps 1 and 2** from 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
[GitLab downloads](https://about.gitlab.com/install/). Do not complete other package of your choice. Be sure to follow _only_ installation steps 1 and 2
steps on the download page. on the page.
1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration. 1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
To maintain uniformity of links across nodes, the `external_url` To maintain uniformity of links across nodes, the `external_url`
on the application server should point to the external URL that users will use on the application server should point to the external URL that users will use
...@@ -704,10 +702,10 @@ The Omnibus GitLab package can be used to configure a standalone Monitoring node ...@@ -704,10 +702,10 @@ The Omnibus GitLab package can be used to configure a standalone Monitoring node
running [Prometheus](../monitoring/prometheus/index.md) and running [Prometheus](../monitoring/prometheus/index.md) and
[Grafana](../monitoring/performance/grafana_configuration.md): [Grafana](../monitoring/performance/grafana_configuration.md):
1. SSH into the Monitoring node. 1. SSH in to the Monitoring node.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
Do not complete any other steps on the download page. on the page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
......
doc/administration/reference_architectures/3k_users.md
View file @ 7ec1b0ac
...@@ -285,12 +285,10 @@ a node and change its status from primary to replica (and vice versa). ...@@ -285,12 +285,10 @@ a node and change its status from primary to replica (and vice versa).
#### Configuring the primary Redis instance #### Configuring the primary Redis instance
1. SSH in to the **Primary** Redis server. 1. SSH in to the **Primary** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -363,12 +361,10 @@ run: redis-exporter: (pid 30075) 76861s; run: log: (pid 29674) 76896s ...@@ -363,12 +361,10 @@ run: redis-exporter: (pid 30075) 76861s; run: log: (pid 29674) 76896s
#### Configuring the replica Redis instances #### Configuring the replica Redis instances
1. SSH in to the **replica** Redis server. 1. SSH in to the **replica** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -456,14 +452,11 @@ clients to report `NOAUTH Authentication required.`. ...@@ -456,14 +452,11 @@ clients to report `NOAUTH Authentication required.`.
To configure the Sentinel: To configure the Sentinel:
1. SSH into the server that will host Consul/Sentinel. 1. SSH in to the server that will host Consul/Sentinel.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus GitLab package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -623,7 +616,7 @@ in the second step, do not supply the `EXTERNAL_URL` value. ...@@ -623,7 +616,7 @@ in the second step, do not supply the `EXTERNAL_URL` value.
#### PostgreSQL primary node #### PostgreSQL primary node
1. SSH into the PostgreSQL primary node. 1. SSH in to the PostgreSQL primary node.
1. Generate a password hash for the PostgreSQL username/password pair. This assumes you will use the default 1. Generate a password hash for the PostgreSQL username/password pair. This assumes you will use the default
username of `gitlab` (recommended). The command will request a password username of `gitlab` (recommended). The command will request a password
and confirmation. Use the value that is output by this command in the next and confirmation. Use the value that is output by this command in the next
...@@ -808,7 +801,7 @@ are supported and can be added if needed. ...@@ -808,7 +801,7 @@ are supported and can be added if needed.
#### PostgreSQL post-configuration #### PostgreSQL post-configuration
SSH into the **primary node**: SSH in to the **primary node**:
1. Open a database prompt: 1. Open a database prompt:
...@@ -844,7 +837,7 @@ SSH into the **primary node**: ...@@ -844,7 +837,7 @@ SSH into the **primary node**:
is not an IP address, it will need to be a resolvable name (via DNS or is not an IP address, it will need to be a resolvable name (via DNS or
`/etc/hosts`) `/etc/hosts`)
SSH into the **secondary node**: SSH in to the **secondary node**:
1. Set up the repmgr standby: 1. Set up the repmgr standby:
...@@ -1115,8 +1108,8 @@ and that your GitLab installation has three repository storages: ...@@ -1115,8 +1108,8 @@ and that your GitLab installation has three repository storages:
On each node: On each node:
1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want (based on _steps 1 and 2_ on the GitLab downloads page), but package of your choice. Be sure to follow _only_ installation steps 1 and 2
_without_ providing the `EXTERNAL_URL` value. on the page, and _do not_ provide the `EXTERNAL_URL` value.
1. Edit `/etc/gitlab/gitlab.rb` to configure the storage paths, enable 1. Edit `/etc/gitlab/gitlab.rb` to configure the storage paths, enable
the network listener, and configure the token: the network listener, and configure the token:
...@@ -1309,10 +1302,10 @@ The following IPs will be used as an example: ...@@ -1309,10 +1302,10 @@ The following IPs will be used as an example:
To configure the Sidekiq nodes, one each one: To configure the Sidekiq nodes, one each one:
1. SSH into the Sidekiq server. 1. SSH in to the Sidekiq server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab package 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
you want using steps 1 and 2 from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
**Do not complete any other steps on the download page.** on the page.
1. Open `/etc/gitlab/gitlab.rb` with your editor: 1. Open `/etc/gitlab/gitlab.rb` with your editor:
```ruby ```ruby
...@@ -1458,9 +1451,9 @@ On each node perform the following: ...@@ -1458,9 +1451,9 @@ On each node perform the following:
mkdir -p /var/opt/gitlab/.ssh /var/opt/gitlab/gitlab-rails/uploads /var/opt/gitlab/gitlab-rails/shared /var/opt/gitlab/gitlab-ci/builds /var/opt/gitlab/git-data mkdir -p /var/opt/gitlab/.ssh /var/opt/gitlab/gitlab-rails/uploads /var/opt/gitlab/gitlab-rails/shared /var/opt/gitlab/gitlab-ci/builds /var/opt/gitlab/git-data
``` ```
1. Download and install Omnibus GitLab using **steps 1 and 2** from 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
[GitLab downloads](https://about.gitlab.com/install/). Do not complete other package of your choice. Be sure to follow _only_ installation steps 1 and 2
steps on the download page. on the page.
1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration. 1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
To maintain uniformity of links across nodes, the `external_url` To maintain uniformity of links across nodes, the `external_url`
on the application server should point to the external URL that users will use on the application server should point to the external URL that users will use
...@@ -1630,10 +1623,10 @@ The Omnibus GitLab package can be used to configure a standalone Monitoring node ...@@ -1630,10 +1623,10 @@ The Omnibus GitLab package can be used to configure a standalone Monitoring node
running [Prometheus](../monitoring/prometheus/index.md) and running [Prometheus](../monitoring/prometheus/index.md) and
[Grafana](../monitoring/performance/grafana_configuration.md): [Grafana](../monitoring/performance/grafana_configuration.md):
1. SSH into the Monitoring node. 1. SSH in to the Monitoring node.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
Do not complete any other steps on the download page. on the page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
......
doc/administration/reference_architectures/50k_users.md
View file @ 7ec1b0ac
...@@ -248,14 +248,11 @@ with the other servers. ...@@ -248,14 +248,11 @@ with the other servers.
To configure Consul: To configure Consul:
1. SSH into the server that will host Consul. 1. SSH in to the server that will host Consul.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus GitLab package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -352,7 +349,7 @@ in the second step, do not supply the `EXTERNAL_URL` value. ...@@ -352,7 +349,7 @@ in the second step, do not supply the `EXTERNAL_URL` value.
#### PostgreSQL primary node #### PostgreSQL primary node
1. SSH into the PostgreSQL primary node. 1. SSH in to the PostgreSQL primary node.
1. Generate a password hash for the PostgreSQL username/password pair. This assumes you will use the default 1. Generate a password hash for the PostgreSQL username/password pair. This assumes you will use the default
username of `gitlab` (recommended). The command will request a password username of `gitlab` (recommended). The command will request a password
and confirmation. Use the value that is output by this command in the next and confirmation. Use the value that is output by this command in the next
...@@ -513,7 +510,7 @@ are supported and can be added if needed. ...@@ -513,7 +510,7 @@ are supported and can be added if needed.
#### PostgreSQL post-configuration #### PostgreSQL post-configuration
SSH into the **primary node**: SSH in to the **primary node**:
1. Open a database prompt: 1. Open a database prompt:
...@@ -548,7 +545,7 @@ SSH into the **primary node**: ...@@ -548,7 +545,7 @@ SSH into the **primary node**:
is not an IP address, it will need to be a resolvable name (via DNS or is not an IP address, it will need to be a resolvable name (via DNS or
`/etc/hosts`) `/etc/hosts`)
SSH into the **secondary node**: SSH in to the **secondary node**:
1. Set up the repmgr standby: 1. Set up the repmgr standby:
...@@ -815,13 +812,11 @@ a node and change its status from primary to replica (and vice versa). ...@@ -815,13 +812,11 @@ a node and change its status from primary to replica (and vice versa).
#### Configure the primary Redis Cache node #### Configure the primary Redis Cache node
1. SSH into the **Primary** Redis server. 1. SSH in to the **Primary** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -871,13 +866,11 @@ You can specify multiple roles, like sentinel and Redis, as: ...@@ -871,13 +866,11 @@ You can specify multiple roles, like sentinel and Redis, as:
#### Configure the replica Redis Cache nodes #### Configure the replica Redis Cache nodes
1. SSH into the **replica** Redis server. 1. SSH in to the **replica** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -965,14 +958,11 @@ clients to report `NOAUTH Authentication required.`. ...@@ -965,14 +958,11 @@ clients to report `NOAUTH Authentication required.`.
To configure the Sentinel Cache server: To configure the Sentinel Cache server:
1. SSH into the server that will host Consul/Sentinel. 1. SSH in to the server that will host Consul/Sentinel.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus GitLab package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1081,13 +1071,11 @@ a node and change its status from primary to replica (and vice versa). ...@@ -1081,13 +1071,11 @@ a node and change its status from primary to replica (and vice versa).
#### Configure the primary Redis Queues node #### Configure the primary Redis Queues node
1. SSH into the **Primary** Redis server. 1. SSH in to the **Primary** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1142,13 +1130,11 @@ You can specify multiple roles, like sentinel and Redis, as: ...@@ -1142,13 +1130,11 @@ You can specify multiple roles, like sentinel and Redis, as:
#### Configure the replica Redis Queues nodes #### Configure the replica Redis Queues nodes
1. SSH into the **replica** Redis Queue server. 1. SSH in to the **replica** Redis Queue server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1236,14 +1222,11 @@ clients to report `NOAUTH Authentication required.`. ...@@ -1236,14 +1222,11 @@ clients to report `NOAUTH Authentication required.`.
To configure the Sentinel Queues server: To configure the Sentinel Queues server:
1. SSH into the server that will host Sentinel. 1. SSH in to the server that will host Sentinel.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus GitLab package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -1402,8 +1385,8 @@ and that your GitLab installation has three repository storages: ...@@ -1402,8 +1385,8 @@ and that your GitLab installation has three repository storages:
On each node: On each node:
1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want (based on _steps 1 and 2_ on the GitLab downloads page), but package of your choice. Be sure to follow _only_ installation steps 1 and 2
_without_ providing the `EXTERNAL_URL` value. on the page, and _do not_ provide the `EXTERNAL_URL` value.
1. Edit `/etc/gitlab/gitlab.rb` to configure the storage paths, enable 1. Edit `/etc/gitlab/gitlab.rb` to configure the storage paths, enable
the network listener, and configure the token: the network listener, and configure the token:
...@@ -1565,10 +1548,10 @@ The following IPs will be used as an example: ...@@ -1565,10 +1548,10 @@ The following IPs will be used as an example:
To configure the Sidekiq nodes, on each one: To configure the Sidekiq nodes, on each one:
1. SSH into the Sidekiq server. 1. SSH in to the Sidekiq server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab package 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
you want using steps 1 and 2 from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
**Do not complete any other steps on the download page.** on the page.
1. Open `/etc/gitlab/gitlab.rb` with your editor: 1. Open `/etc/gitlab/gitlab.rb` with your editor:
```ruby ```ruby
...@@ -1702,10 +1685,9 @@ The following IPs will be used as an example: ...@@ -1702,10 +1685,9 @@ The following IPs will be used as an example:
On each node perform the following: On each node perform the following:
1. Download and install Omnibus GitLab using **steps 1 and 2** from 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
[GitLab downloads](https://about.gitlab.com/install/). Do not complete other package of your choice. Be sure to follow _only_ installation steps 1 and 2
steps on the download page. on the page.
1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace 1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace
the file of the same name on this server. If that file is not on this server, the file of the same name on this server. If that file is not on this server,
add the file from your Consul server to this server. add the file from your Consul server to this server.
...@@ -1905,11 +1887,10 @@ The following IP will be used as an example: ...@@ -1905,11 +1887,10 @@ The following IP will be used as an example:
To configure the Monitoring node: To configure the Monitoring node:
1. SSH into the Monitoring node. 1. SSH in to the Monitoring node.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
Do not complete any other steps on the download page. on the page.
1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace 1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace
the file of the same name on this server. If that file is not on this server, the file of the same name on this server. If that file is not on this server,
add the file from your Consul server to this server. add the file from your Consul server to this server.
......
doc/administration/reference_architectures/5k_users.md
View file @ 7ec1b0ac
...@@ -284,13 +284,11 @@ a node and change its status from primary to replica (and vice versa). ...@@ -284,13 +284,11 @@ a node and change its status from primary to replica (and vice versa).
#### Configuring the primary Redis instance #### Configuring the primary Redis instance
1. SSH into the **Primary** Redis server. 1. SSH in to the **Primary** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -362,13 +360,11 @@ run: redis-exporter: (pid 30075) 76861s; run: log: (pid 29674) 76896s ...@@ -362,13 +360,11 @@ run: redis-exporter: (pid 30075) 76861s; run: log: (pid 29674) 76896s
#### Configuring the replica Redis instances #### Configuring the replica Redis instances
1. SSH into the **replica** Redis server. 1. SSH in to the **replica** Redis server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to both follow _only_ installation steps 1 and 2
- Make sure you select the correct Omnibus package, with the same version on the page, and to select the correct Omnibus GitLab package, with the same version
and type (Community, Enterprise editions) of your current install. and type (Community or Enterprise editions) as your current install.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -456,14 +452,11 @@ clients to report `NOAUTH Authentication required.`. ...@@ -456,14 +452,11 @@ clients to report `NOAUTH Authentication required.`.
To configure the Sentinel: To configure the Sentinel:
1. SSH into the server that will host Consul/Sentinel. 1. SSH in to the server that will host Consul/Sentinel.
1. [Download/install](https://about.gitlab.com/install/) the 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
Omnibus GitLab Enterprise Edition package using **steps 1 and 2** from the package of your choice. Be sure to both follow _only_ installation steps 1 and 2
GitLab downloads page. on the page, and to select the correct Omnibus GitLab package, with the same version
- Make sure you select the correct Omnibus package, with the same version and type (Community or Enterprise editions) as your current install.
the GitLab application is running.
- Do not complete any other steps on the download page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
...@@ -623,7 +616,7 @@ in the second step, do not supply the `EXTERNAL_URL` value. ...@@ -623,7 +616,7 @@ in the second step, do not supply the `EXTERNAL_URL` value.
#### PostgreSQL primary node #### PostgreSQL primary node
1. SSH into the PostgreSQL primary node. 1. SSH in to the PostgreSQL primary node.
1. Generate a password hash for the PostgreSQL username/password pair. This assumes you will use the default 1. Generate a password hash for the PostgreSQL username/password pair. This assumes you will use the default
username of `gitlab` (recommended). The command will request a password username of `gitlab` (recommended). The command will request a password
and confirmation. Use the value that is output by this command in the next and confirmation. Use the value that is output by this command in the next
...@@ -808,7 +801,7 @@ are supported and can be added if needed. ...@@ -808,7 +801,7 @@ are supported and can be added if needed.
#### PostgreSQL post-configuration #### PostgreSQL post-configuration
SSH into the **primary node**: SSH in to the **primary node**:
1. Open a database prompt: 1. Open a database prompt:
...@@ -843,7 +836,7 @@ SSH into the **primary node**: ...@@ -843,7 +836,7 @@ SSH into the **primary node**:
is not an IP address, it will need to be a resolvable name (via DNS or is not an IP address, it will need to be a resolvable name (via DNS or
`/etc/hosts`) `/etc/hosts`)
SSH into the **secondary node**: SSH in to the **secondary node**:
1. Set up the repmgr standby: 1. Set up the repmgr standby:
...@@ -1114,8 +1107,8 @@ and that your GitLab installation has three repository storages: ...@@ -1114,8 +1107,8 @@ and that your GitLab installation has three repository storages:
On each node: On each node:
1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want (based on _steps 1 and 2_ on the GitLab downloads page), but package of your choice. Be sure to follow _only_ installation steps 1 and 2
_without_ providing the `EXTERNAL_URL` value. on the page, and _do not_ provide the `EXTERNAL_URL` value.
1. Edit `/etc/gitlab/gitlab.rb` to configure the storage paths, enable 1. Edit `/etc/gitlab/gitlab.rb` to configure the storage paths, enable
the network listener, and configure the token: the network listener, and configure the token:
...@@ -1308,10 +1301,10 @@ The following IPs will be used as an example: ...@@ -1308,10 +1301,10 @@ The following IPs will be used as an example:
To configure the Sidekiq nodes, one each one: To configure the Sidekiq nodes, one each one:
1. SSH into the Sidekiq server. 1. SSH in to the Sidekiq server.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab package 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
you want using steps 1 and 2 from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
**Do not complete any other steps on the download page.** on the page.
1. Open `/etc/gitlab/gitlab.rb` with your editor: 1. Open `/etc/gitlab/gitlab.rb` with your editor:
```ruby ```ruby
...@@ -1457,9 +1450,9 @@ On each node perform the following: ...@@ -1457,9 +1450,9 @@ On each node perform the following:
mkdir -p /var/opt/gitlab/.ssh /var/opt/gitlab/gitlab-rails/uploads /var/opt/gitlab/gitlab-rails/shared /var/opt/gitlab/gitlab-ci/builds /var/opt/gitlab/git-data mkdir -p /var/opt/gitlab/.ssh /var/opt/gitlab/gitlab-rails/uploads /var/opt/gitlab/gitlab-rails/shared /var/opt/gitlab/gitlab-ci/builds /var/opt/gitlab/git-data
``` ```
1. Download and install Omnibus GitLab using **steps 1 and 2** from 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
[GitLab downloads](https://about.gitlab.com/install/). Do not complete other package of your choice. Be sure to follow _only_ installation steps 1 and 2
steps on the download page. on the page.
1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration. 1. Create or edit `/etc/gitlab/gitlab.rb` and use the following configuration.
To maintain uniformity of links across nodes, the `external_url` To maintain uniformity of links across nodes, the `external_url`
on the application server should point to the external URL that users will use on the application server should point to the external URL that users will use
...@@ -1629,10 +1622,10 @@ The Omnibus GitLab package can be used to configure a standalone Monitoring node ...@@ -1629,10 +1622,10 @@ The Omnibus GitLab package can be used to configure a standalone Monitoring node
running [Prometheus](../monitoring/prometheus/index.md) and running [Prometheus](../monitoring/prometheus/index.md) and
[Grafana](../monitoring/performance/grafana_configuration.md): [Grafana](../monitoring/performance/grafana_configuration.md):
1. SSH into the Monitoring node. 1. SSH in to the Monitoring node.
1. [Download/install](https://about.gitlab.com/install/) the Omnibus GitLab 1. [Download and install](https://about.gitlab.com/install/) the Omnibus GitLab
package you want using **steps 1 and 2** from the GitLab downloads page. package of your choice. Be sure to follow _only_ installation steps 1 and 2
Do not complete any other steps on the download page. on the page.
1. Edit `/etc/gitlab/gitlab.rb` and add the contents: 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby ```ruby
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7