From 1d1c11164739ad6bb3bba176316f15e7b78a33b6 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 27 Aug 2014 16:54:20 +0200 Subject: [PATCH] Change the permissions of gitlab-rails dir, change location of the sockets directory. --- files/gitlab-cookbooks/gitlab/attributes/default.rb | 2 +- files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 4325d7a..6d646fb 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -158,7 +158,7 @@ default['gitlab']['unicorn']['log_directory'] = "/var/log/gitlab/unicorn" default['gitlab']['unicorn']['worker_processes'] = 2 default['gitlab']['unicorn']['listen'] = '127.0.0.1' default['gitlab']['unicorn']['port'] = 8080 -default['gitlab']['unicorn']['socket'] = '/var/opt/gitlab/gitlab-rails/tmp/sockets/gitlab.socket' +default['gitlab']['unicorn']['socket'] = '/var/opt/gitlab/gitlab-rails/sockets/gitlab.socket' default['gitlab']['unicorn']['pidfile'] = '/opt/gitlab/var/unicorn/unicorn.pid' default['gitlab']['unicorn']['tcp_nopush'] = true default['gitlab']['unicorn']['backlog_socket'] = 64 diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb index 3efab02..5982e50 100644 --- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb +++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb @@ -26,7 +26,6 @@ gitlab_rails_public_uploads_dir = node['gitlab']['gitlab-rails']['uploads_direct gitlab_rails_log_dir = node['gitlab']['gitlab-rails']['log_directory'] [ - gitlab_rails_dir, gitlab_rails_etc_dir, gitlab_rails_env_dir, gitlab_rails_working_dir, @@ -43,6 +42,19 @@ gitlab_rails_log_dir = node['gitlab']['gitlab-rails']['log_directory'] end end +directory gitlab_rails_dir do + owner node['gitlab']['user']['username'] + mode '0755' + recursive true +end + +directory File.join(gitlab_rails_dir, "sockets") do + owner node['gitlab']['user']['username'] + group node['gitlab']['web_server']['username'] + mode '0770' + recursive true +end + dependent_services = [] dependent_services << "service[unicorn]" if OmnibusHelper.should_notify?("unicorn") dependent_services << "service[sidekiq]" if OmnibusHelper.should_notify?("sidekiq") -- libgit2 0.21.2