Commit 35755fb6 authored by Robert Marshall's avatar Robert Marshall
Browse files

Remove last vestiges helper sockets_directory



- Had removed sockets_directory method from most places, but needed to
  remove it from the helper and that exposed it being used in one other
  location
Signed-off-by: default avatarRobert Marshall <rmarshall@gitlab.com>
parent 7199a2c7
......@@ -3,12 +3,6 @@ require_relative 'base_helper'
class GitlabWorkhorseHelper < BaseHelper
attr_reader :node
 
def sockets_directory
return unless unix_socket?
node['gitlab']['gitlab-workhorse']['sockets_directory']
end
def unix_socket?
node['gitlab']['gitlab-workhorse']['listen_network'] == "unix"
end
......
......@@ -22,7 +22,7 @@ working_dir = node['gitlab']['gitlab-workhorse']['dir']
log_directory = node['gitlab']['gitlab-workhorse']['log_directory']
gitlab_workhorse_static_etc_dir = "/opt/gitlab/etc/gitlab-workhorse"
workhorse_env_dir = node['gitlab']['gitlab-workhorse']['env_directory']
gitlab_workhorse_socket_dir = workhorse_helper.sockets_directory
gitlab_workhorse_socket_dir = node['gitlab']['gitlab-workhorse']['sockets_directory']
 
directory working_dir do
owner account_helper.gitlab_user
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment