From eb1c9312841c953a59e8a1eedaebb5f9af850bd0 Mon Sep 17 00:00:00 2001
From: Michael Fenn <fennm@deshawresearch.com>
Date: Thu, 22 May 2014 20:38:29 -0400
Subject: [PATCH] Support changing 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, 9 insertions(+), 1 deletion(-)

diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index 2a67ef8..ac90595 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -53,6 +53,7 @@ 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 d773808..c469308 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
@@ -24,6 +24,13 @@ 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 e0033af..1a5b740 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: git
+    user: <%= @gitlab_user %>
 
     ## Email settings
     # Email address used in the "From" field in mails sent by GitLab
--
libgit2 0.21.2