Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a8517c1f
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a8517c1f
编写于
6月 22, 2017
作者:
J
Jacob Vosmaer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add documentation for running Gitaly on another server
上级
270ca89d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
142 addition
and
0 deletion
+142
-0
changelogs/unreleased/doc-gitaly-network.yml
changelogs/unreleased/doc-gitaly-network.yml
+4
-0
doc/administration/gitaly/index.md
doc/administration/gitaly/index.md
+138
-0
未找到文件。
changelogs/unreleased/doc-gitaly-network.yml
0 → 100644
浏览文件 @
a8517c1f
---
title
:
Add option to run Gitaly on a remote server
merge_request
:
12381
author
:
doc/administration/gitaly/index.md
浏览文件 @
a8517c1f
...
...
@@ -33,6 +33,144 @@ prometheus_listen_addr = "localhost:9236"
Changes to
`/home/git/gitaly/config.toml`
are applied when you run
`service
gitlab restart`
.
## Running Gitaly on its own server
> This is an optional way to deploy Gitaly which can benefit GitLab
installations that are larger than a single machine. Most
installations will be better served with the default configuration
used by Omnibus and the GitLab source installation guide.
Starting with GitLab 9.4 it is possible to run Gitaly on a different
server from the rest of the application. This can improve performance
when running GitLab with its repositories stored on an NFS server.
At the moment (GitLab 9.4) Gitaly is not yet a replacement for NFS
because some parts of GitLab still bypass Gitaly when accessing Git
repositories. If you choose to deploy Gitaly on your NFS server you
must still also mount your Git shares on your GitLab application
servers.
Gitaly network traffic is unencrypted so you should use a firewall to
restrict access to your Gitaly server.
Below we describe how to configure a Gitaly server at address
`gitaly.internal:9999`
with secret token
`abc123secret`
. We assume
your GitLab installation has two repository storages,
`default`
and
`storage1`
.
### Client side token configuration
Start by configuring a token on the client side.
Omnibus installations:
```
ruby
# /etc/gitlab/gitlab.rb
gitlab_rails
[
'gitaly_token'
]
=
'abc123secret'
```
Source installations:
```
yaml
# /home/git/gitlab/config/gitlab.yml
gitlab
:
gitaly
:
token
:
'
abc123secret'
```
You need to reconfigure (Omnibus) or restart (source) for these
changes to be picked up.
### Gitaly server configuration
Next, on the Gitaly server, we need to configure storage paths, enable
the network listener and configure the token.
Note: if you want to reduce the risk of downtime when you enable
authentication you can temporarily disable enforcement, see
https://gitlab.com/gitlab-org/gitaly/blob/master/doc/configuration/README.md#authentication
.
In most or all cases the storage paths below end in
`/repositories`
. Check the
directory layout on your Gitaly server to be sure.
Omnibus installations:
```
ruby
# /etc/gitlab/gitlab.rb
gitaly
[
'listen_addr'
]
=
'0.0.0.0:9999'
gitaly
[
'auth_token'
]
=
'abc123secret'
gitaly
[
'storage'
]
=
[
{
'name'
=>
'default'
,
'path'
=>
'/path/to/default/repositories'
},
{
'name'
=>
'storage1'
,
'path'
=>
'/path/to/storage1/repositories'
},
]
```
Source installations:
```
toml
# /home/git/gitaly/config.toml
listen_addr
=
'0.0.0.0:9999'
[auth]
token
=
'abc123secret'
[[storage]
name
=
'default'
path
=
'/path/to/default/repositories'
[[storage]]
name
=
'storage1'
path
=
'/path/to/storage1/repositories'
```
Again, reconfigure (Omnibus) or restart (source).
### Converting clients to use the Gitaly server
Now as the final step update the client machines to switch from using
their local Gitaly service to the new Gitaly server you just
configured. This is a risky step because if there is any sort of
network, firewall, or name resolution problem preventing your GitLab
server from reaching the Gitaly server then all Gitaly requests will
fail.
We assume that your Gitaly server can be reached at
`gitaly.internal:9999`
from your GitLab server, and that your GitLab
NFS shares are mounted at
`/mnt/gitlab/default`
and
`/mnt/gitlab/storage1`
respectively.
Omnibus installations:
```
ruby
# /etc/gitlab/gitlab.rb
git_data_dirs
({
{
'default'
=>
{
'path'
=>
'/mnt/gitlab/default'
,
'gitaly_address'
=>
'tcp://gitlab.internal:9999'
}
},
{
'storage1'
=>
{
'path'
=>
'/mnt/gitlab/storage1'
,
'gitaly_address'
=>
'tcp://gitlab.internal:9999'
}
},
})
```
Source installations:
```
yaml
# /home/git/gitlab/config/gitlab.yml
gitlab
:
repositories
:
storages
:
default
:
path
:
/mnt/gitlab/default/repositories
gitaly_address
:
tcp://gitlab.internal:9999
storage1
:
path
:
/mnt/gitlab/storage1/repositories
gitaly_address
:
tcp://gitlab.internal:9999
```
Now reconfigure (Omnibus) or restart (source). When you tail the
Gitaly logs on your Gitaly server (
`sudo gitlab-ctl tail gitaly`
or
`tail -f /home/git/gitlab/log/gitaly.log`
) you should see requests
coming in. One sure way to trigger a Gitaly request is to clone a
repository from your GitLab server over HTTP.
## Configuring GitLab to not use Gitaly
Gitaly is still an optional component in GitLab 9.3. This means you
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录