summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-03-31 02:37:45 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-04-19 20:04:31 +0200
commit6cb65c8c344e733902d7193facc71cdc8ce569c7 (patch)
tree9e84d6c47e2104897a8bfe3e8b2b6aecf510d05d /lib
parentbb6dcf2d1ab01ecaec92e3144992b62302b007f4 (diff)
downloadgitlab-ce-6cb65c8c344e733902d7193facc71cdc8ce569c7.tar.gz
Make location of gitlab_workhorse_secret configurable
Hard-coding location of configuration files is very bad practice. This patch applies the same approach as currently used for gitlab_shell_secret file.
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/workhorse.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index e6e40f6945d..c551f939df1 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -168,7 +168,7 @@ module Gitlab
end
def secret_path
- Rails.root.join('.gitlab_workhorse_secret')
+ Gitlab.config.workhorse.secret_file
end
def set_key_and_notify(key, value, expire: nil, overwrite: true)