Download as
Browse Code »

Commit 17f6e1e09d3ce6dcec8bb55fce4be8768432c136

Authored by Jacob Vosmaer
1 parent 8959c64b
Exists in 6-9-stable-ee and in 1 other branch 6-9-stable

Create the authorized-keys.lock file 

Conflicts:
	CHANGELOG
Showing 2 changed files with 21 additions and 0 deletions   Show diff stats
  1 +7.0.0
  2 +- Specify numeric user / group identifiers
  3 +- Support AWS S3 attachment storage
  4 +- Send application email via SMTP
  5 +- Support changing the name of the "git" user / group (Michael Fenn)
  6 +- Configure omniauth in gitlab.yml
  7 +- Expose more fields under 'extra' in gitlab.yml
  8 +- Zero-downtime Unicorn restarts
  9 +- Support changing the 'signin_enabled' option (Konstantinos Paliouras)
  10 +- Fix Nginx HTTP-to-HTTPS log configuration error (Konstantinos Paliouras)
  11 +- Create the authorized-keys.lock file for gitlab-shell 1.9.4
  12 +
  13 +6.9.1
  14 +- Fix Nginx HTTP-to-HTTPS log configuration error (Konstantinos Paliouras)
  15 +
1 6.9.0 16 6.9.0
2 - Make SSH port in clone URLs configurable (Julien Pivotto) 17 - Make SSH port in clone URLs configurable (Julien Pivotto)
3 - Fix default Postgres port for non-packaged DBMS (Drew Blessing) 18 - Fix default Postgres port for non-packaged DBMS (Drew Blessing)
files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
  Diff comments   View file @17f6e1e
@@ -46,6 +46,12 @@ file authorized_keys do @@ -46,6 +46,12 @@ file authorized_keys do
46 mode "0600" 46 mode "0600"
47 end 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 # If SELinux is enabled, make sure that OpenSSH thinks the .ssh directory of the 55 # If SELinux is enabled, make sure that OpenSSH thinks the .ssh directory of the
50 # git_user is valid. 56 # git_user is valid.
51 execute "chcon -t ssh_home_t #{ssh_dir}" do 57 execute "chcon -t ssh_home_t #{ssh_dir}" do