From e9ad74c8f584cf6049b2d6fe8b80a06a1a279c14 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 28 May 2014 12:11:33 +0200 Subject: [PATCH] Create the authorized-keys.lock file --- CHANGELOG | 1 + files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ef86afe..5bb42a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ - Zero-downtime Unicorn restarts - Support changing the 'signin_enabled' option (Konstantinos Paliouras) - Fix Nginx HTTP-to-HTTPS log configuration error (Konstantinos Paliouras) +- Create the authorized-keys.lock file for gitlab-shell 1.9.4 6.9.1 - Fix Nginx HTTP-to-HTTPS log configuration error (Konstantinos Paliouras) diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb index fa3bf5a..e79c464 100644 --- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb +++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb @@ -46,6 +46,12 @@ file authorized_keys do mode "0600" end +# gitlab-shell 1.9.4 uses a lock file in the gitlab-shell root +file File.join(gitlab_shell_dir, "authorized_keys.lock") do + owner git_user + group git_group +end + # If SELinux is enabled, make sure that OpenSSH thinks the .ssh directory of the # git_user is valid. execute "chcon -t ssh_home_t #{ssh_dir}" do -- libgit2 0.21.2