Download as
Browse Code »

Commit 3f3f39e41a08fa8181779d3f41dcf6ecfceae614

Authored by Jacob Vosmaer
2 parents e0359c39 e9ad74c8
Exists in master and in 9 other branches 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

Merge branch 'gitlab_shell_authorized_keys_lock' into 'master' 

Gitlab-shell authorized_keys.lock
Showing 2 changed files with 7 additions and 0 deletions   Show diff stats
CHANGELOG
  Diff comments   View file @3f3f39e
... ... @@ -8,6 +8,7 @@
8 8 - Zero-downtime Unicorn restarts
9 9 - Support changing the 'signin_enabled' option (Konstantinos Paliouras)
10 10 - Fix Nginx HTTP-to-HTTPS log configuration error (Konstantinos Paliouras)
  11 +- Create the authorized-keys.lock file for gitlab-shell 1.9.4
11 12  
12 13 6.9.1
13 14 - Fix Nginx HTTP-to-HTTPS log configuration error (Konstantinos Paliouras)
... ...
files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
  Diff comments   View file @3f3f39e
... ... @@ -46,6 +46,12 @@ file authorized_keys do
46 46 mode "0600"
47 47 end
48 48  
  49 +# gitlab-shell 1.9.4 uses a lock file in the gitlab-shell root
  50 +file File.join(gitlab_shell_dir, "authorized_keys.lock") do
  51 + owner git_user
  52 + group git_group
  53 +end
  54 +
49 55 # If SELinux is enabled, make sure that OpenSSH thinks the .ssh directory of the
50 56 # git_user is valid.
51 57 execute "chcon -t ssh_home_t #{ssh_dir}" do
... ...