Skip to content
Snippets Groups Projects
Commit ca4031b8 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Do not set git username and email anymore.

parent b60c549b
No related branches found
No related tags found
1 merge request!365Remove git user email git user name
Loading
Loading
@@ -227,8 +227,6 @@ external_url 'GENERATED_EXTERNAL_URL'
# user['shell'] = "/bin/sh"
# # The home directory for the git user
# user['home'] = "/var/opt/gitlab"
# user['git_user_name'] = "GitLab"
# user['git_user_email'] = "gitlab@#{node['fqdn']}"
 
##################
# GitLab Unicorn #
Loading
Loading
Loading
Loading
@@ -37,9 +37,6 @@ default['gitlab']['user']['gid'] = nil
default['gitlab']['user']['shell'] = "/bin/sh"
# The home directory for the chef services user
default['gitlab']['user']['home'] = "/var/opt/gitlab"
default['gitlab']['user']['git_user_name'] = "GitLab"
default['gitlab']['user']['git_user_email'] = "gitlab@#{node['fqdn']}"
 
####
# GitLab Rails app
Loading
Loading
Loading
Loading
@@ -109,7 +109,7 @@ module Gitlab
unless uri.host
raise "GitLab external URL must include a schema and FQDN, e.g. http://gitlab.example.com/"
end
Gitlab['user']['git_user_email'] ||= "gitlab@#{uri.host}"
Gitlab['gitlab_rails']['gitlab_host'] = uri.host
Gitlab['gitlab_rails']['gitlab_email_from'] ||= "gitlab@#{uri.host}"
 
Loading
Loading
# This file is managed by gitlab-ctl. Manual changes will be
# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
# and run `sudo gitlab-ctl reconfigure`.
[user]
name = <%= node['gitlab']['user']['git_user_name'] %>
email = <%= node['gitlab']['user']['git_user_email'] %>
[core]
autocrlf = input
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment