Merge branch '1717-configure-gitlab-shell-path' into 'master'

Allow /var/opt/gitlab/gitlab-shell to be a configurable path

Closes #1717

See merge request !1141

files/gitlab-config-template/gitlab.rb.template

@@ -486,6 +486,9 @@ external_url 'GENERATED_EXTERNAL_URL'
 # It needs to exist so we can check permissions and avoid to throwing warnings to the users.
 # gitlab_shell['git_trace_log_file'] = "/var/log/gitlab/gitlab-shell/gitlab-shell-git-trace.log"
+# We do not recommend changing this directory.
+# gitlab_shell['dir'] = "/var/opt/gitlab/gitlab-shell"
+
 #####################
 # GitLab PostgreSQL #
 #####################

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -317,6 +317,7 @@ default['gitlab']['sidekiq']['concurrency'] = 25
 ###
 # gitlab-shell
 ###
+default['gitlab']['gitlab-shell']['dir'] = "/var/opt/gitlab/gitlab-shell"
 default['gitlab']['gitlab-shell']['log_directory'] = "/var/log/gitlab/gitlab-shell/"
 default['gitlab']['gitlab-shell']['log_level'] = nil
 default['gitlab']['gitlab-shell']['audit_usernames'] = nil

files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb

@@ -20,7 +20,7 @@ account_helper = AccountHelper.new(node)
 git_user = account_helper.gitlab_user
 git_group = account_helper.gitlab_group
 gitlab_shell_dir = "/opt/gitlab/embedded/service/gitlab-shell"
-gitlab_shell_var_dir = "/var/opt/gitlab/gitlab-shell"
+gitlab_shell_var_dir = node['gitlab']['gitlab-shell']['dir']
 git_data_directories = node['gitlab']['gitlab-shell']['git_data_directories']
 repositories_storages = node['gitlab']['gitlab-rails']['repositories_storages']
 ssh_dir = File.join(node['gitlab']['user']['home'], ".ssh")

spec/chef/recipes/gitlab-shell_spec.rb

@@ -34,6 +34,17 @@ describe 'gitlab::gitlab-shell' do
     end
   end
+  context 'with a non-default directory' do
+    before do
+      stub_gitlab_rb(gitlab_shell: {
+        dir: '/export/gitlab/gitlab-shell',
+      })
+    end
+    it 'creates config file in specified location' do
+      expect(chef_run).to render_file('/export/gitlab/gitlab-shell/config.yml')
+    end
+  end
+
   context 'with a non-default log directory' do
     before do
       stub_gitlab_rb(gitlab_shell: {