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
37176b59
Commit
37176b59
authored
Jul 03, 2020
by
Ben Bodenmiller
Committed by
Evan Read
Jul 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clarify Gitaly mixed configuration details
parent
ac01a943
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
doc/administration/gitaly/index.md
doc/administration/gitaly/index.md
+11
-6
No files found.
doc/administration/gitaly/index.md
View file @
37176b59
...
...
@@ -388,9 +388,10 @@ Gitaly makes the following assumptions:
clients, and that Gitaly server can read and write to
`/mnt/gitlab/storage2`
.
-
Your
`gitaly1.internal`
and
`gitaly2.internal`
Gitaly servers can reach each other.
You can't define Gitaly servers with some as a local directory (with
`path`
) and some as remote
server (with
`gitaly_address`
). However, local and remote Gitaly services can be used together. See
[
mixed configuration
](
#mixed-configuration
)
for more information.
You can't define Gitaly servers with some as a local Gitaly server
(without
`gitaly_address`
) and some as remote
server (with
`gitaly_address`
) unless you setup with special
[
mixed configuration
](
#mixed-configuration
)
.
**For Omnibus GitLab**
...
...
@@ -459,13 +460,14 @@ to all Gitaly servers.
GitLab can reside on the same server as one of many Gitaly servers, but doesn't support
configuration that mixes local and remote configuration. The following setup is incorrect, because:
-
`path`
is invalid for some of the Gitaly servers.
-
All addresses must be reachable from the other Gitaly servers.
-
`storage1`
will be assigned a Unix socket for
`gitaly_address`
which is
invalid for some of the Gitaly servers.
```
ruby
git_data_dirs
({
'default'
=>
{
'gitaly_address'
=>
'tcp://gitaly1.internal:8075'
},
'storage1'
=>
{
'path'
=>
'/
var/op
t/gitlab/git-data'
},
'storage1'
=>
{
'path'
=>
'/
mn
t/gitlab/git-data'
},
'storage2'
=>
{
'gitaly_address'
=>
'tcp://gitaly2.internal:8075'
},
})
```
...
...
@@ -477,11 +479,14 @@ example:
git_data_dirs
({
'default'
=>
{
'gitaly_address'
=>
'tcp://gitaly1.internal:8075'
},
# Address of the GitLab server that has Gitaly running on it
'storage1'
=>
{
'gitaly_address'
=>
'tcp://gitlab.internal:8075'
},
'storage1'
=>
{
'gitaly_address'
=>
'tcp://gitlab.internal:8075'
,
'path'
=>
'/mnt/gitlab/git-data'
},
'storage2'
=>
{
'gitaly_address'
=>
'tcp://gitaly2.internal:8075'
},
})
```
`path`
can only be included for storage shards on the local Gitaly server.
If it's excluded, default Git storage directory will be used for that storage shard.
### Disable Gitaly where not required (optional)
If you are running Gitaly
[
as a remote service
](
#run-gitaly-on-its-own-server
)
you may want to
...
...
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