Download as
Browse Code »

Commit 31bd4a964820e26eec3883696f47595d27662f03

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

Create a global .gitconfig for the git user

Showing 3 changed files with 17 additions and 1 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @31bd4a9
@@ -31,6 +31,8 @@ default['gitlab']['user']['group'] = "git" @@ -31,6 +31,8 @@ default['gitlab']['user']['group'] = "git"
31 default['gitlab']['user']['shell'] = "/bin/sh" 31 default['gitlab']['user']['shell'] = "/bin/sh"
32 # The home directory for the chef services user 32 # The home directory for the chef services user
33 default['gitlab']['user']['home'] = "/var/opt/gitlab" 33 default['gitlab']['user']['home'] = "/var/opt/gitlab"
  34 +default['gitlab']['user']['git_user_name'] = "GitLab"
  35 +default['gitlab']['user']['git_user_email'] = "gitlab@#{node['fqdn']}"
34 36
35 37
36 #### 38 ####
files/gitlab-cookbooks/gitlab/recipes/users.rb
  Diff comments   View file @31bd4a9
@@ -16,12 +16,21 @@ @@ -16,12 +16,21 @@
16 # 16 #
17 17
18 gitlab_username = node['gitlab']['user']['username'] 18 gitlab_username = node['gitlab']['user']['username']
  19 +gitlab_home = node['gitlab']['user']['home']
19 20
20 group gitlab_username 21 group gitlab_username
21 22
22 # Create a user for Chef services to run as 23 # Create a user for Chef services to run as
23 user gitlab_username do 24 user gitlab_username do
24 shell node['gitlab']['user']['shell'] 25 shell node['gitlab']['user']['shell']
25 - home node['gitlab']['user']['home'] 26 + home gitlab_home
26 gid gitlab_username 27 gid gitlab_username
27 end 28 end
  29 +
  30 +template File.join(gitlab_home, ".gitconfig") do
  31 + source "gitconfig.erb"
  32 + owner gitlab_username
  33 + group node['gitlab']['user']['group']
  34 + mode "0644"
  35 + variables(node['gitlab']['user'].to_hash)
  36 +end
files/gitlab-cookbooks/gitlab/templates/default/gitconfig.erb 0 → 100644
  Diff comments   View file @31bd4a9
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +[user]
  2 + name = <%= node['gitlab']['user']['git_user_name'] %>
  3 + email = <%= node['gitlab']['user']['git_user_email'] %>
  4 +[core]
  5 + autocrlf = input