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
cde4f8d7
Commit
cde4f8d7
authored
Oct 25, 2019
by
John Cai
Committed by
Douglas Barbosa Alexandre
Nov 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add internal_socket_dir to gitaly config in setup helper
parent
5d94e9d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
changelogs/unreleased/jc-add-internal-socket-dir-to-setup.yml
...gelogs/unreleased/jc-add-internal-socket-dir-to-setup.yml
+5
-0
lib/gitlab/setup_helper.rb
lib/gitlab/setup_helper.rb
+5
-0
No files found.
changelogs/unreleased/jc-add-internal-socket-dir-to-setup.yml
0 → 100644
View file @
cde4f8d7
---
title
:
Add internal_socket_dir to gitaly config in setup helper
merge_request
:
19170
author
:
type
:
other
lib/gitlab/setup_helper.rb
View file @
cde4f8d7
...
@@ -40,6 +40,11 @@ module Gitlab
...
@@ -40,6 +40,11 @@ module Gitlab
config
=
{
socket_path:
address
.
sub
(
/\Aunix:/
,
''
),
storage:
storages
}
config
=
{
socket_path:
address
.
sub
(
/\Aunix:/
,
''
),
storage:
storages
}
config
[
:auth
]
=
{
token:
'secret'
}
if
Rails
.
env
.
test?
config
[
:auth
]
=
{
token:
'secret'
}
if
Rails
.
env
.
test?
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
[
:'gitaly-ruby'
]
=
{
dir:
File
.
join
(
gitaly_dir
,
'ruby'
)
}
if
gitaly_ruby
config
[
:'gitlab-shell'
]
=
{
dir:
Gitlab
.
config
.
gitlab_shell
.
path
}
config
[
:'gitlab-shell'
]
=
{
dir:
Gitlab
.
config
.
gitlab_shell
.
path
}
config
[
:bin_dir
]
=
Gitlab
.
config
.
gitaly
.
client_path
config
[
:bin_dir
]
=
Gitlab
.
config
.
gitaly
.
client_path
...
...
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