Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
097c0fb5
Commit
097c0fb5
authored
Jul 31, 2020
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply 6 suggestion(s) to 1 file(s)
parent
420f97b1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
doc/administration/reference_architectures/10k_users.md
doc/administration/reference_architectures/10k_users.md
+5
-6
No files found.
doc/administration/reference_architectures/10k_users.md
View file @
097c0fb5
...
@@ -421,7 +421,7 @@ in the second step, do not supply the `EXTERNAL_URL` value.
...
@@ -421,7 +421,7 @@ in the second step, do not supply the `EXTERNAL_URL` value.
#### PostgreSQL secondary nodes
#### PostgreSQL secondary nodes
1.
On both the secondary nodes, add the same configuration specified above for the primary node
1.
On both the secondary nodes, add the same configuration specified above for the primary node
with an additional setting that will inform
`gitlab-ctl`
that they are standby nodes initially
with an additional setting
(
`repmgr['master_on_initialization'] = false`
)
that will inform
`gitlab-ctl`
that they are standby nodes initially
and there's no need to attempt to register them as a primary node:
and there's no need to attempt to register them as a primary node:
```
ruby
```
ruby
...
@@ -1318,7 +1318,7 @@ To configure the Sentinel Queues server:
...
@@ -1318,7 +1318,7 @@ To configure the Sentinel Queues server:
Only the primary GitLab application server should handle migrations.
Only the primary GitLab application server should handle migrations.
1.
[
Reconfigure Omnibus GitLab
](
../restart_gitlab.md#omnibus-gitlab-reconfigure
)
for the changes to take effect.
1.
[
Reconfigure Omnibus GitLab
](
../restart_gitlab.md#omnibus-gitlab-reconfigure
)
for the changes to take effect.
1.
Go through the steps again for all the other
Consul/
Sentinel nodes, and
1.
Go through the steps again for all the other Sentinel nodes, and
make sure you set up the correct IPs.
make sure you set up the correct IPs.
<div
align=
"right"
>
<div
align=
"right"
>
...
@@ -1400,7 +1400,7 @@ On each node:
...
@@ -1400,7 +1400,7 @@ On each node:
# to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API.
# to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API.
# The following two values must be the same as their respective values
# The following two values must be the same as their respective values
# of the GitLab Rails application setup
# of the GitLab Rails application setup
gitaly
[
'auth_token'
]
=
'git
la
ysecret'
gitaly
[
'auth_token'
]
=
'git
al
ysecret'
gitlab_shell
[
'secret_token'
]
=
'shellsecret'
gitlab_shell
[
'secret_token'
]
=
'shellsecret'
# Avoid running unnecessary services on the Gitaly server
# Avoid running unnecessary services on the Gitaly server
...
@@ -1537,7 +1537,7 @@ To configure Gitaly with TLS:
...
@@ -1537,7 +1537,7 @@ To configure Gitaly with TLS:
## Configure Sidekiq
## Configure Sidekiq
Sidekiq requires connection
to the Redis, PostgreSQL and Gitaly instance
.
Sidekiq requires connection
s to the Redis, PostgreSQL and Gitaly instances
.
The following IPs will be used as an example:
The following IPs will be used as an example:
-
`10.6.0.101`
: Sidekiq 1
-
`10.6.0.101`
: Sidekiq 1
...
@@ -1545,7 +1545,7 @@ The following IPs will be used as an example:
...
@@ -1545,7 +1545,7 @@ The following IPs will be used as an example:
-
`10.6.0.103`
: Sidekiq 3
-
`10.6.0.103`
: Sidekiq 3
-
`10.6.0.104`
: Sidekiq 4
-
`10.6.0.104`
: Sidekiq 4
To configure the Sidekiq nodes, on
e
each one:
To configure the Sidekiq nodes, on each one:
1.
SSH into the Sidekiq server.
1.
SSH into the Sidekiq server.
1.
[
Download/install
](
https://about.gitlab.com/install/
)
the Omnibus GitLab package
1.
[
Download/install
](
https://about.gitlab.com/install/
)
the Omnibus GitLab package
...
@@ -1564,7 +1564,6 @@ you want using steps 1 and 2 from the GitLab downloads page.
...
@@ -1564,7 +1564,6 @@ you want using steps 1 and 2 from the GitLab downloads page.
gitlab_rails
[
'auto_migrate'
]
=
false
gitlab_rails
[
'auto_migrate'
]
=
false
alertmanager
[
'enable'
]
=
false
alertmanager
[
'enable'
]
=
false
gitaly
[
'enable'
]
=
false
gitaly
[
'enable'
]
=
false
gitlab_monitor
[
'enable'
]
=
false
gitlab_workhorse
[
'enable'
]
=
false
gitlab_workhorse
[
'enable'
]
=
false
nginx
[
'enable'
]
=
false
nginx
[
'enable'
]
=
false
puma
[
'enable'
]
=
false
puma
[
'enable'
]
=
false
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment