Download as
Browse Code »

Commit 2aa0155f23445fff3d6ecadc4a50e6803b1bbdc6

Authored by Jacob Vosmaer
1 parent 633eee51
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

Put repositories and satellites in git-data/

Showing 2 changed files with 13 additions and 12 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @2aa0155
@@ -86,10 +86,10 @@ default['gitlab']['gitlab-rails']['ldap_method'] = "ssl" @@ -86,10 +86,10 @@ default['gitlab']['gitlab-rails']['ldap_method'] = "ssl"
86 default['gitlab']['gitlab-rails']['ldap_bind_dn'] = "_the_full_dn_of_the_user_you_will_bind_with" 86 default['gitlab']['gitlab-rails']['ldap_bind_dn'] = "_the_full_dn_of_the_user_you_will_bind_with"
87 default['gitlab']['gitlab-rails']['ldap_password'] = "_the_password_of_the_bind_user" 87 default['gitlab']['gitlab-rails']['ldap_password'] = "_the_password_of_the_bind_user"
88 default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = true 88 default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = true
89 -default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/gitlab-satellites" 89 +default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites"
90 default['gitlab']['gitlab-rails']['backup_path'] = "tmp/backups" 90 default['gitlab']['gitlab-rails']['backup_path'] = "tmp/backups"
91 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/" 91 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/"
92 -default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/repositories" 92 +default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/git-data/repositories"
93 default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/" 93 default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/"
94 default['gitlab']['gitlab-rails']['gitlab_shell_upload_pack'] = true 94 default['gitlab']['gitlab-rails']['gitlab_shell_upload_pack'] = true
95 default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = true 95 default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = true
@@ -125,6 +125,7 @@ default['gitlab']['sidekiq']['log_directory'] = "/var/log/gitlab/sidekiq" @@ -125,6 +125,7 @@ default['gitlab']['sidekiq']['log_directory'] = "/var/log/gitlab/sidekiq"
125 # gitlab-shell 125 # gitlab-shell
126 ### 126 ###
127 default['gitlab']['gitlab-shell']['log_directory'] = "/var/log/gitlab/gitlab-shell/" 127 default['gitlab']['gitlab-shell']['log_directory'] = "/var/log/gitlab/gitlab-shell/"
  128 +default['gitlab']['gitlab-shell']['git_data_directory'] = "/var/opt/gitlab/git-data"
128 129
129 130
130 ### 131 ###
files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
  Diff comments   View file @2aa0155
@@ -44,16 +44,16 @@ execute "chcon -t ssh_home_t #{ssh_dir}" do @@ -44,16 +44,16 @@ execute "chcon -t ssh_home_t #{ssh_dir}" do
44 only_if "id -Z" 44 only_if "id -Z"
45 end 45 end
46 46
47 -directory log_directory do  
48 - owner git_user  
49 - mode "0700"  
50 - recursive true  
51 -end  
52 -  
53 -directory gitlab_shell_var_dir do  
54 - owner git_user  
55 - mode '0700'  
56 - recursive true 47 +[
  48 + log_directory,
  49 + gitlab_shell_var_dir,
  50 + node['gitlab']['gitlab-shell']['git_data_directory']
  51 +].each do |dir|
  52 + directory dir do
  53 + owner git_user
  54 + mode "0700"
  55 + recursive true
  56 + end
57 end 57 end
58 58
59 template_symlink File.join(gitlab_shell_var_dir, "config.yml") do 59 template_symlink File.join(gitlab_shell_var_dir, "config.yml") do