From 37c03d26f57c070cf027ad329f7204fe974ffe81 Mon Sep 17 00:00:00 2001 From: Michael Fenn Date: Fri, 23 May 2014 09:45:31 -0400 Subject: [PATCH] Simpler approach to setting user in gitlab.yml --- files/gitlab-cookbooks/gitlab/attributes/default.rb | 1 - files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb | 7 ------- files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index ac90595..2a67ef8 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -53,7 +53,6 @@ default['gitlab']['gitlab-rails']['rate_limit_period'] = 60 default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn'] default['gitlab']['gitlab-rails']['gitlab_port'] = 80 default['gitlab']['gitlab-rails']['gitlab_https'] = false -default['gitlab']['gitlab-rails']['gitlab_user'] = default['gitlab']['user']['username'] default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}" default['gitlab']['gitlab-rails']['gitlab_support_email'] = "support@localhost" default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10 diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb index c469308..d773808 100644 --- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb +++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb @@ -24,13 +24,6 @@ gitlab_rails_tmp_dir = File.join(gitlab_rails_dir, "tmp") gitlab_rails_public_uploads_dir = node['gitlab']['gitlab-rails']['uploads_directory'] gitlab_rails_log_dir = node['gitlab']['gitlab-rails']['log_directory'] -# in gitlab.yml, use the main gitlab username if the admin did -# not specifically set gitlab_user -if node['gitlab']['gitlab-rails']['gitlab_user'] == - node.default['gitlab']['gitlab-rails']['gitlab_user'] - node.set['gitlab']['gitlab-rails']['gitlab_user'] = node['gitlab']['user']['username'] -end - [ gitlab_rails_dir, gitlab_rails_etc_dir, diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 1a5b740..b3cac9e 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -24,7 +24,7 @@ production: &base # relative_url_root: /gitlab # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') - user: <%= @gitlab_user %> + user: <%= node['gitlab']['user']['username'] %> ## Email settings # Email address used in the "From" field in mails sent by GitLab -- libgit2 0.21.2