diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-24 11:02:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-24 11:02:25 +0000 |
| commit | 499d875652610dd1e1f02bff67c7544672850ff8 (patch) | |
| tree | ec6cc72fc0921bef9d1148f6bdc0bd014b7d3658 /config | |
| parent | 770b2f5171e6e44a79b6a2f0cc60672909ce351d (diff) | |
| parent | 6cb65c8c344e733902d7193facc71cdc8ce569c7 (diff) | |
| download | gitlab-ce-499d875652610dd1e1f02bff67c7544672850ff8.tar.gz | |
Merge branch 'workhorse-secret-path' into 'master'
Make location of gitlab_workhorse_secret configurable
See merge request !10357
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 06c9f734c2a..c2eaf263937 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -505,6 +505,11 @@ production: &base # If you use non-standard ssh port you need to specify it # ssh_port: 22 + workhorse: + # File that contains the secret key for verifying access for gitlab-workhorse. + # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). + # secret_file: /home/git/gitlab/.gitlab_workhorse_secret + ## Git settings # CAUTION! # Use the default values unless you really know what you are doing diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 87bf48a3dcd..7a8f00f11b2 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -388,6 +388,12 @@ Settings.gitlab_shell['owner_group'] ||= Settings.gitlab.user Settings.gitlab_shell['ssh_path_prefix'] ||= Settings.__send__(:build_gitlab_shell_ssh_path_prefix) # +# Workhorse +# +Settings['workhorse'] ||= Settingslogic.new({}) +Settings.workhorse['secret_file'] ||= Rails.root.join('.gitlab_workhorse_secret') + +# # Repositories # Settings['repositories'] ||= Settingslogic.new({}) |