From 17f6e1e09d3ce6dcec8bb55fce4be8768432c136 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 28 May 2014 12:11:33 +0200
Subject: [PATCH] Create the authorized-keys.lock file

---
 CHANGELOG                                             | 15 +++++++++++++++
 files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb |  6 ++++++
 2 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5a5849c..5bb42a6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,18 @@
+7.0.0
+- Specify numeric user / group identifiers
+- Support AWS S3 attachment storage
+- Send application email via SMTP
+- Support changing the name of the "git" user / group (Michael Fenn)
+- Configure omniauth in gitlab.yml
+- Expose more fields under 'extra' in gitlab.yml
+- 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)
+
 6.9.0
 - Make SSH port in clone URLs configurable (Julien Pivotto)
 - Fix default Postgres port for non-packaged DBMS (Drew Blessing)
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