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
1aa95c2b
Commit
1aa95c2b
authored
Mar 29, 2022
by
Kyle Wiebers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'pks-gitaly-runtime-dir' into 'master'"
This reverts merge request !83750
parent
d742fcad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
8 deletions
+5
-8
doc/administration/gitaly/configure_gitaly.md
doc/administration/gitaly/configure_gitaly.md
+1
-4
lib/gitlab/setup_helper.rb
lib/gitlab/setup_helper.rb
+3
-3
spec/support/helpers/gitaly_setup.rb
spec/support/helpers/gitaly_setup.rb
+1
-1
No files found.
doc/administration/gitaly/configure_gitaly.md
View file @
1aa95c2b
...
...
@@ -300,7 +300,7 @@ disable enforcement. For more information, see the documentation on configuring
```
toml
listen_addr
=
'0.0.0.0:8075'
runtime
_dir
=
'/var/opt/gitlab/gitaly'
internal_socket
_dir
=
'/var/opt/gitlab/gitaly'
[logging]
format
=
'json'
...
...
@@ -308,9 +308,6 @@ disable enforcement. For more information, see the documentation on configuring
dir
=
'/var/log/gitaly'
```
For GitLab 14.9 and earlier, set `internal_socket_dir = '/var/opt/gitlab/gitaly'` instead
of `runtime_dir`.
1.
Append the following to
`/home/git/gitaly/config.toml`
for each respective Gitaly server:
On
`gitaly1.internal`
:
...
...
lib/gitlab/setup_helper.rb
View file @
1aa95c2b
...
...
@@ -124,9 +124,9 @@ module Gitlab
config
[
:storage
]
=
storages
runtime_dir
=
options
[
:runtime_dir
]
||
File
.
join
(
gitaly_dir
,
'run
'
)
FileUtils
.
mkdir
(
runtime_dir
)
unless
File
.
exist?
(
runtime
_dir
)
config
[
:
runtime_dir
]
=
runtime
_dir
internal_socket_dir
=
options
[
:internal_socket_dir
]
||
File
.
join
(
gitaly_dir
,
'internal_sockets
'
)
FileUtils
.
mkdir
(
internal_socket_dir
)
unless
File
.
exist?
(
internal_socket
_dir
)
config
[
:
internal_socket_dir
]
=
internal_socket
_dir
config
[
:'gitaly-ruby'
]
=
{
dir:
File
.
join
(
gitaly_dir
,
'ruby'
)
}
if
gitaly_ruby
config
[
:'gitlab-shell'
]
=
{
dir:
Gitlab
.
config
.
gitlab_shell
.
path
}
...
...
spec/support/helpers/gitaly_setup.rb
View file @
1aa95c2b
...
...
@@ -267,7 +267,7 @@ module GitalySetup
{
'default'
=>
repos_path
},
force:
true
,
options:
{
runtime_dir:
File
.
join
(
gitaly_dir
,
"run
2"
),
internal_socket_dir:
File
.
join
(
gitaly_dir
,
"internal_gitaly
2"
),
gitaly_socket:
"gitaly2.socket"
,
config_filename:
"gitaly2.config.toml"
}
...
...
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