471b5910a6
The tasks gitlab:env:info mixes user and group, and presume as a group 'git'.
However, gitolite group name can be anything.
That patch add the git group name in the config,
and check gitolite.ssh_user group against git.group
(which defaults to 'git', as before this patch, if undefined).
M config/gitlab.yml.example:
Add 'group' in 'git' section
Mention default value for the two extra settings
M lib/tasks/gitlab/check.rake:
Check that gitolite.ssh_user *group* is the one defined in git.group.
Make sure to default to 'git' as the expected group
if said group is undefined in the config.
Note: uses a more complete regexp for the group detection
(the group can start, end or be in the middle or the list of groups
of gitolite.ssh_user)
M: config/initializers/1_settings.rb:
Add default values for gitolite.group and gitlab.user
120 lines
3.5 KiB
Plaintext
120 lines
3.5 KiB
Plaintext
# # # # # # # # # # # # # # # # # #
|
|
# Gitlab application config file #
|
|
# # # # # # # # # # # # # # # # # #
|
|
#
|
|
# How to use:
|
|
# 1. copy file as gitlab.yml
|
|
# 2. Replace gitlab -> host with your domain
|
|
# 3. Replace gitolite -> ssh_host with your domain
|
|
# 4. Replace gitlab -> email_from
|
|
|
|
#
|
|
# 1. GitLab app settings
|
|
# ==========================
|
|
|
|
## GitLab settings
|
|
gitlab:
|
|
## Web server settings
|
|
host: localhost
|
|
port: 80
|
|
https: false
|
|
# uncomment and customize to run in non-root path
|
|
# note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed
|
|
# relative_url_root: /gitlab
|
|
|
|
## Email settings
|
|
# Email address used in the "From" field in mails sent by GitLab
|
|
email_from: gitlab@localhost
|
|
|
|
## Project settings
|
|
default_projects_limit: 10
|
|
|
|
## Account used for GitLab installation ('gitlab' if undefined)
|
|
user: gitlab
|
|
|
|
## Gravatar
|
|
gravatar:
|
|
enabled: true # Use user avatar images from Gravatar.com (default: true)
|
|
# plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
|
|
# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
|
|
|
|
|
|
|
|
#
|
|
# 2. Auth settings
|
|
# ==========================
|
|
|
|
## LDAP settings
|
|
ldap:
|
|
enabled: false
|
|
host: '_your_ldap_server'
|
|
base: '_the_base_where_you_search_for_users'
|
|
port: 636
|
|
uid: 'sAMAccountName'
|
|
method: 'ssl' # "ssl" or "plain"
|
|
bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
|
|
password: '_the_password_of_the_bind_user'
|
|
|
|
## Omniauth settings
|
|
omniauth:
|
|
# Enable ability for users
|
|
# Allow logging in via Twitter, Google, etc. using Omniauth providers
|
|
enabled: false
|
|
|
|
# CAUTION!
|
|
# This allows users to login without having a user account first (default: false)
|
|
# User accounts will be created automatically when authentication was successful.
|
|
allow_single_sign_on: false
|
|
# Locks down those users until they have been cleared by the admin (default: true)
|
|
block_auto_created_users: true
|
|
|
|
## Auth providers
|
|
# Uncomment the lines and fill in the data of the auth provider you want to use
|
|
# If your favorite auth provider is not listed you can user others:
|
|
# see https://github.com/gitlabhq/gitlabhq/wiki/Using-Custom-Omniauth-Providers
|
|
providers:
|
|
# - { name: 'google_oauth2', app_id: 'YOUR APP ID',
|
|
# app_secret: 'YOUR APP SECRET',
|
|
# args: { access_type: 'offline', approval_prompt: '' } }
|
|
# - { name: 'twitter', app_id: 'YOUR APP ID',
|
|
# app_secret: 'YOUR APP SECRET'}
|
|
# - { name: 'github', app_id: 'YOUR APP ID',
|
|
# app_secret: 'YOUR APP SECRET' }
|
|
|
|
|
|
|
|
#
|
|
# 3. Advanced settings
|
|
# ==========================
|
|
|
|
## Backup settings
|
|
backup:
|
|
path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/)
|
|
# keep_time: 604800 # default: 0 (forever) (in seconds)
|
|
|
|
## Gitolite settings
|
|
gitolite:
|
|
admin_uri: git@localhost:gitolite-admin
|
|
# repos_path must not be a symlink
|
|
repos_path: /home/git/repositories/
|
|
hooks_path: /home/git/.gitolite/hooks/
|
|
admin_key: gitlab
|
|
upload_pack: true
|
|
receive_pack: true
|
|
ssh_user: git
|
|
ssh_host: localhost
|
|
group: git # default: 'git' if undefined
|
|
# ssh_port: 22
|
|
# config_file: gitolite.conf
|
|
|
|
## Git settings
|
|
# CAUTION!
|
|
# Use the default values unless you really know what you are doing
|
|
git:
|
|
bin_path: /usr/bin/git
|
|
# Max size of git object like commit, in bytes
|
|
# This value can be increased if you have a very large commits
|
|
max_size: 5242880 # 5.megabytes
|
|
# Git timeout to read commit, in seconds
|
|
timeout: 10
|