Download as
Browse Code »

Commit da017f4f63fce09d317db56e89e34a379f8ffc1d

Authored by Jacob Vosmaer
2 parents 7585fdf9 98d399b1
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 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 'centos_gitlab_shell' into 'master' 

Centos Gitlab Shell
Showing 2 changed files with 9 additions and 4 deletions   Show diff stats
config/software/gitlab-shell.rb
  Diff comments   View file @da017f4
@@ -25,17 +25,16 @@ dependency "rsync" @@ -25,17 +25,16 @@ dependency "rsync"
25 source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git" 25 source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git"
26 26
27 build do 27 build do
  28 + command "mkdir -p #{install_dir}/embedded/service/gitlab-shell"
  29 + command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-shell/"
28 block do 30 block do
29 env_shebang = "#!/usr/bin/env ruby" 31 env_shebang = "#!/usr/bin/env ruby"
30 `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script| 32 `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script|
31 script = File.read(ruby_script) 33 script = File.read(ruby_script)
32 - next if script.start_with?("#!#{install_dir}") # Shebang looks good, skip this script  
33 - erb :dest => ruby_script, 34 + erb :dest => ruby_script.sub(project_dir, "#{install_dir}/embedded/service/gitlab-shell"),
34 :source => "ruby_script_wrapper.erb", 35 :source => "ruby_script_wrapper.erb",
35 :mode => 0755, 36 :mode => 0755,
36 :vars => {:script => script, :install_dir => install_dir} 37 :vars => {:script => script, :install_dir => install_dir}
37 end 38 end
38 end 39 end
39 - command "mkdir -p #{install_dir}/embedded/service/gitlab-shell"  
40 - command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-shell/"  
41 end 40 end
files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
  Diff comments   View file @da017f4
@@ -38,6 +38,12 @@ directory ssh_dir do @@ -38,6 +38,12 @@ directory ssh_dir do
38 recursive true 38 recursive true
39 end 39 end
40 40
  41 +# If SELinux is enabled, make sure that OpenSSH thinks the .ssh directory of the
  42 +# git_user is valid.
  43 +execute "chcon -t user_home_t #{ssh_dir}" do
  44 + only_if "id -Z"
  45 +end
  46 +
41 directory log_directory do 47 directory log_directory do
42 owner git_user 48 owner git_user
43 recursive true 49 recursive true