Download as
Browse Code »

Commit 1ece0386aad29bc1129e7d079ee8f75a956c97f5

Authored by Jacob Vosmaer
1 parent d68b16d1
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Build path string using File.join

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
  Diff comments   View file @1ece038
... ... @@ -29,7 +29,7 @@ template File.join(gitlab_shell_dir, "config.yml") do
29 29 :user => git_user,
30 30 :api_url => node['gitlab']['gitlab-core']['internal_api_url'],
31 31 :repositories_path => repositories_path,
32   - :ssh_dir => ssh_dir,
  32 + :authorized_keys => File.join(ssh_dir, "authorized_keys"),
33 33 :redis_port => node['gitlab']['redis']['port'],
34 34 :log_file => File.join(log_directory, "gitlab-shell.log")
35 35 )
... ...
files/gitlab-cookbooks/gitlab/templates/default/gitlab-shell-config.yml.erb
  Diff comments   View file @1ece038
... ... @@ -18,7 +18,7 @@ http_settings:
18 18 repos_path: "<%= @repositories_path %>"
19 19  
20 20 # File used as authorized_keys for gitlab user
21   -auth_file: "<%= @ssh_dir %>/authorized_keys"
  21 +auth_file: "<%= @authorized_keys %>"
22 22  
23 23 # Redis settings used for pushing commit notices to gitlab
24 24 redis:
... ...