Commit f5ba45daabaaae0f38924713d957002a14691da4
Exists in
master
and in
9 other branches
Resolve conflict in 'cookbook-support-changing-user-in-gitlab.yml'
Conflicts: CHANGELOG
Showing
3 changed files
with
17 additions
and
1 deletions
Show diff stats
CHANGELOG
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | - Specify numeric user / group identifiers | 2 | - Specify numeric user / group identifiers |
| 3 | - Support AWS S3 attachment storage | 3 | - Support AWS S3 attachment storage |
| 4 | - Send application email via SMTP | 4 | - Send application email via SMTP |
| 5 | +- Support changing the name of the "git" user / group (Michael Fenn) | ||
| 5 | 6 | ||
| 6 | 6.9.0 | 7 | 6.9.0 |
| 7 | - Make SSH port in clone URLs configurable (Julien Pivotto) | 8 | - Make SSH port in clone URLs configurable (Julien Pivotto) |
README.md
| @@ -171,6 +171,21 @@ git_data_dir "/mnt/nas/git-data" | @@ -171,6 +171,21 @@ git_data_dir "/mnt/nas/git-data" | ||
| 171 | 171 | ||
| 172 | Run `sudo gitlab-ctl reconfigure` for the change to take effect. | 172 | Run `sudo gitlab-ctl reconfigure` for the change to take effect. |
| 173 | 173 | ||
| 174 | +### Changing the name of the Git user / group | ||
| 175 | + | ||
| 176 | +By default, omnibus-gitlab uses the user name `git` for Git gitlab-shell login, | ||
| 177 | +ownership of the Git data itself, and SSH URL generation on the web interface. | ||
| 178 | +Similarly, `git` group is used for group ownership of the Git data. You can | ||
| 179 | +change the user and group by adding the following lines to | ||
| 180 | +`/etc/gitlab/gitlab.rb`. | ||
| 181 | + | ||
| 182 | +```ruby | ||
| 183 | +user['username'] = "gitlab" | ||
| 184 | +user['group'] = "gitlab" | ||
| 185 | +``` | ||
| 186 | + | ||
| 187 | +Run `sudo gitlab-ctl reconfigure` for the change to take effect. | ||
| 188 | + | ||
| 174 | ### Setting up LDAP sign-in | 189 | ### Setting up LDAP sign-in |
| 175 | 190 | ||
| 176 | If you have an LDAP directory service such as Active Directory, you can configure | 191 | If you have an LDAP directory service such as Active Directory, you can configure |
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
| @@ -24,7 +24,7 @@ production: &base | @@ -24,7 +24,7 @@ production: &base | ||
| 24 | # relative_url_root: /gitlab | 24 | # relative_url_root: /gitlab |
| 25 | 25 | ||
| 26 | # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') | 26 | # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') |
| 27 | - # user: git | 27 | + user: <%= node['gitlab']['user']['username'] %> |
| 28 | 28 | ||
| 29 | ## Email settings | 29 | ## Email settings |
| 30 | # Email address used in the "From" field in mails sent by GitLab | 30 | # Email address used in the "From" field in mails sent by GitLab |