Download as
Browse Code »

Commit 4b8f7b9607e6af84ef4c64ebc3d4bf1fb572c17a

Authored by Jacob Vosmaer
1 parent e2bc5d11
Exists in master and in 4 other branches 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee

Recursively set the SELinux type of ~git/.ssh

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
@@ -8,6 +8,7 @@ omnibus-gitlab repository. @@ -8,6 +8,7 @@ omnibus-gitlab repository.
8 - Fix MySQL build for Ubuntu 14.04 8 - Fix MySQL build for Ubuntu 14.04
9 - Built-in UDP log shipping (Enterprise Edition only) 9 - Built-in UDP log shipping (Enterprise Edition only)
10 - Trigger Unicorn/Sidekiq restart during version change 10 - Trigger Unicorn/Sidekiq restart during version change
  11 +- Recursively set the SELinux type of ~git/.ssh
11 12
12 7.0.0-ee.omnibus.1 13 7.0.0-ee.omnibus.1
13 - Fix MySQL build for Ubuntu 14.04 14 - Fix MySQL build for Ubuntu 14.04
files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
  Diff comments   View file @4b8f7b9
@@ -54,7 +54,7 @@ end @@ -54,7 +54,7 @@ end
54 54
55 # 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
56 # git_user is valid. 56 # git_user is valid.
57 -execute "chcon -t ssh_home_t #{ssh_dir}" do 57 +execute "chcon --recursive --type ssh_home_t #{ssh_dir}" do
58 only_if "id -Z" 58 only_if "id -Z"
59 end 59 end
60 60