Skip to content
Snippets Groups Projects
Commit 3f547988 authored by Robert Marshall's avatar Robert Marshall
Browse files

Change listen_addr default to nil


- Per review discussin, change the workhorse listen_addr default to nil

Signed-off-by: default avatarRobert Marshall <rmarshall@gitlab.com>
parent 55fbd9d5
No related branches found
No related tags found
Loading
......@@ -610,7 +610,7 @@ default['gitlab']['gitlab-workhorse']['ha'] = false
default['gitlab']['gitlab-workhorse']['listen_network'] = "unix"
default['gitlab']['gitlab-workhorse']['listen_umask'] = 000
default['gitlab']['gitlab-workhorse']['sockets_directory'] = "/var/opt/gitlab/gitlab-workhorse/sockets"
default['gitlab']['gitlab-workhorse']['listen_addr'] = "/var/opt/gitlab/gitlab-workhorse/sockets/socket"
default['gitlab']['gitlab-workhorse']['listen_addr'] = nil
default['gitlab']['gitlab-workhorse']['auth_backend'] = "http://localhost:8080"
default['gitlab']['gitlab-workhorse']['auth_socket'] = nil
default['gitlab']['gitlab-workhorse']['cable_backend'] = "http://localhost:8280"
......
......@@ -6,7 +6,11 @@ class GitlabWorkhorseHelper < BaseHelper
def socket_file_name
return unless unix_socket?
File.basename(node['gitlab']['gitlab-workhorse']['listen_addr'])
file_path = node['gitlab']['gitlab-workhorse']['listen_addr']
return File.basename(file_path) unless file_path.nil?
'socket'
end
def sockets_directory
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment