mirror of
https://github.com/sameersbn/docker-gitlab.git
synced 2026-01-18 13:58:25 +00:00
updated configuration templates
This commit is contained in:
parent
f766917920
commit
072ea3d563
@ -29,14 +29,14 @@ production: &base
|
||||
## GitLab settings
|
||||
gitlab:
|
||||
## Web server settings (note: host is the FQDN, do not include http://)
|
||||
host: "{{GITLAB_HOST}}"
|
||||
host: {{GITLAB_HOST}}
|
||||
port: {{GITLAB_PORT}}
|
||||
https: {{GITLAB_HTTPS}}
|
||||
|
||||
# Uncommment this line below if your ssh host is different from HTTP/HTTPS one
|
||||
# (you'd obviously need to replace ssh.host_example.com with your own host).
|
||||
# Otherwise, ssh host will be set to the `host:` value above
|
||||
ssh_host: "{{GITLAB_SSH_HOST}}"
|
||||
ssh_host: {{GITLAB_SSH_HOST}}
|
||||
|
||||
# WARNING: See config/application.rb under "Relative url support" for the list of
|
||||
# other files that need to be changed for relative url support
|
||||
@ -48,15 +48,15 @@ production: &base
|
||||
## Date & Time settings
|
||||
# Uncomment and customize if you want to change the default time zone of GitLab application.
|
||||
# To see all available zones, run `bundle exec rake time:zones:all RAILS_ENV=production`
|
||||
time_zone: "{{GITLAB_TIMEZONE}}"
|
||||
time_zone: '{{GITLAB_TIMEZONE}}'
|
||||
|
||||
## Email settings
|
||||
# Uncomment and set to false if you need to disable email sending from GitLab (default: true)
|
||||
email_enabled: {{GITLAB_EMAIL_ENABLED}}
|
||||
# Email address used in the "From" field in mails sent by GitLab
|
||||
email_from: "{{GITLAB_EMAIL}}"
|
||||
email_display_name: "{{GITLAB_EMAIL_DISPLAY_NAME}}"
|
||||
email_reply_to: "{{GITLAB_EMAIL_REPLY_TO}}"
|
||||
email_from: {{GITLAB_EMAIL}}
|
||||
email_display_name: {{GITLAB_EMAIL_DISPLAY_NAME}}
|
||||
email_reply_to: {{GITLAB_EMAIL_REPLY_TO}}
|
||||
|
||||
# Email server smtp settings are in config/initializers/smtp_settings.rb.sample
|
||||
|
||||
@ -126,8 +126,8 @@ production: &base
|
||||
## Gravatar
|
||||
## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html
|
||||
gravatar:
|
||||
enabled: {{GITLAB_GRAVATAR_ENABLED}} # Use user avatar image from Gravatar.com (default: true)
|
||||
# plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
|
||||
enabled: {{GITLAB_GRAVATAR_ENABLED}} # Use user avatar image from Gravatar.com (default: true)
|
||||
# gravatar urls: possible placeholders: %{hash} %{size} %{email}
|
||||
plain_url: "{{GITLAB_GRAVATAR_HTTP_URL}}" # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
|
||||
ssl_url: "{{GITLAB_GRAVATAR_HTTPS_URL}}" # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
|
||||
|
||||
@ -145,7 +145,7 @@ production: &base
|
||||
add_pusher: {{GITLAB_NOTIFY_PUSHER}}
|
||||
|
||||
# The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root
|
||||
builds_path: "{{GITLAB_BUILDS_DIR}}"
|
||||
builds_path: {{GITLAB_BUILDS_DIR}}
|
||||
|
||||
#
|
||||
# 3. Auth settings
|
||||
@ -173,14 +173,14 @@ production: &base
|
||||
# for instance if you find out it is too large to fit on the web page.
|
||||
#
|
||||
# Example: 'Paris' or 'Acme, Ltd.'
|
||||
label: "{{LDAP_LABEL}}"
|
||||
label: '{{LDAP_LABEL}}'
|
||||
|
||||
host: "{{LDAP_HOST}}"
|
||||
host: '{{LDAP_HOST}}'
|
||||
port: {{LDAP_PORT}}
|
||||
uid: "{{LDAP_UID}}"
|
||||
method: "{{LDAP_METHOD}}" # "tls" or "ssl" or "plain"
|
||||
bind_dn: "{{LDAP_BIND_DN}}"
|
||||
password: "{{LDAP_PASS}}"
|
||||
uid: '{{LDAP_UID}}'
|
||||
method: '{{LDAP_METHOD}}' # "tls" or "ssl" or "plain"
|
||||
bind_dn: '{{LDAP_BIND_DN}}'
|
||||
password: '{{LDAP_PASS}}'
|
||||
|
||||
# This setting specifies if LDAP server is Active Directory LDAP server.
|
||||
# For non AD servers it skips the AD specific queries.
|
||||
@ -207,7 +207,7 @@ production: &base
|
||||
#
|
||||
# Ex. ou=People,dc=gitlab,dc=example
|
||||
#
|
||||
base: "{{LDAP_BASE}}"
|
||||
base: '{{LDAP_BASE}}'
|
||||
|
||||
# Filter LDAP users
|
||||
#
|
||||
@ -216,7 +216,7 @@ production: &base
|
||||
#
|
||||
# Note: GitLab does not support omniauth-ldap's custom filter syntax.
|
||||
#
|
||||
user_filter: "{{LDAP_USER_FILTER}}"
|
||||
user_filter: '{{LDAP_USER_FILTER}}'
|
||||
|
||||
# LDAP attributes that GitLab will use to create an account for the LDAP user.
|
||||
# The specified attribute can either be the attribute name as a string (e.g. 'mail'),
|
||||
@ -226,13 +226,13 @@ production: &base
|
||||
# The username will be used in paths for the user's own projects
|
||||
# (like `gitlab.example.com/username/project`) and when mentioning
|
||||
# them in issues, merge request and comments (like `@username`).
|
||||
# If the attribute specified for `username` contains an email address,
|
||||
# If the attribute specified for `username` contains an email address,
|
||||
# the GitLab username will be the part of the email address before the '@'.
|
||||
username: ['uid', 'userid', 'sAMAccountName']
|
||||
email: ['mail', 'email', 'userPrincipalName']
|
||||
|
||||
# If no full name could be found at the attribute specified for `name`,
|
||||
# the full name is determined using the attributes specified for
|
||||
# the full name is determined using the attributes specified for
|
||||
# `first_name` and `last_name`.
|
||||
name: 'cn'
|
||||
first_name: 'givenName'
|
||||
@ -275,23 +275,26 @@ production: &base
|
||||
# Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html
|
||||
providers:
|
||||
- { name: 'google_oauth2',
|
||||
label: 'Google', app_id: '{{OAUTH_GOOGLE_API_KEY}}',
|
||||
label: 'Google',
|
||||
app_id: '{{OAUTH_GOOGLE_API_KEY}}',
|
||||
app_secret: '{{OAUTH_GOOGLE_APP_SECRET}}',
|
||||
args: { access_type: 'offline', approval_prompt: '{{OAUTH_GOOGLE_APPROVAL_PROMPT}}', hd: '{{OAUTH_GOOGLE_RESTRICT_DOMAIN}}' } }
|
||||
- { name: 'twitter',
|
||||
app_id: '{{OAUTH_TWITTER_API_KEY}}',
|
||||
app_secret: '{{OAUTH_TWITTER_APP_SECRET}}'}
|
||||
app_secret: '{{OAUTH_TWITTER_APP_SECRET}}' }
|
||||
- { name: 'github',
|
||||
label: 'GitHub', app_id: '{{OAUTH_GITHUB_API_KEY}}',
|
||||
label: 'GitHub',
|
||||
app_id: '{{OAUTH_GITHUB_API_KEY}}',
|
||||
app_secret: '{{OAUTH_GITHUB_APP_SECRET}}',
|
||||
args: { scope: '{{OAUTH_GITHUB_SCOPE}}' } }
|
||||
- { name: 'gitlab',
|
||||
label: 'GitLab.com', app_id: '{{OAUTH_GITLAB_API_KEY}}',
|
||||
label: 'GitLab.com',
|
||||
app_id: '{{OAUTH_GITLAB_API_KEY}}',
|
||||
app_secret: '{{OAUTH_GITLAB_APP_SECRET}}',
|
||||
args: { scope: '{{OAUTH_GITLAB_SCOPE}}' } }
|
||||
- { name: 'bitbucket',
|
||||
app_id: '{{OAUTH_BITBUCKET_API_KEY}}',
|
||||
app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}'}
|
||||
app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}' }
|
||||
- { name: 'saml',
|
||||
label: 'Our SAML Provider',
|
||||
args: {
|
||||
@ -316,7 +319,7 @@ production: &base
|
||||
# GitLab Satellites
|
||||
satellites:
|
||||
# Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
|
||||
path: "{{GITLAB_DATA_DIR}}/gitlab-satellites/"
|
||||
path: {{GITLAB_DATA_DIR}}/gitlab-satellites/
|
||||
timeout: {{GITLAB_SATELLITES_TIMEOUT}}
|
||||
|
||||
## Backup settings
|
||||
@ -337,18 +340,20 @@ production: &base
|
||||
# # Use multipart uploads when file size reaches 100MB, see
|
||||
# # http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html
|
||||
# multipart_chunk_size: 104857600
|
||||
# # Turns on AWS Server-Side Encryption with Amazon S3-Managed Keys for backups, this is optional
|
||||
# # encryption: 'AES256'
|
||||
|
||||
## GitLab Shell settings
|
||||
gitlab_shell:
|
||||
path: "{{GITLAB_SHELL_INSTALL_DIR}}/"
|
||||
path: {{GITLAB_SHELL_INSTALL_DIR}}/
|
||||
|
||||
# REPOS_PATH MUST NOT BE A SYMLINK!!!
|
||||
repos_path: "{{GITLAB_REPOS_DIR}}/"
|
||||
hooks_path: "{{GITLAB_SHELL_INSTALL_DIR}}/hooks/"
|
||||
repos_path: {{GITLAB_REPOS_DIR}}/
|
||||
hooks_path: {{GITLAB_SHELL_INSTALL_DIR}}/hooks/
|
||||
|
||||
# File that contains the secret key for verifying access for gitlab-shell.
|
||||
# Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
|
||||
secret_file: "{{GITLAB_INSTALL_DIR}}/.gitlab_shell_secret"
|
||||
secret_file: {{GITLAB_INSTALL_DIR}}/.gitlab_shell_secret
|
||||
|
||||
# Git over HTTP
|
||||
upload_pack: true
|
||||
@ -440,7 +445,6 @@ test:
|
||||
user_filter: ''
|
||||
group_base: 'ou=groups,dc=example,dc=com'
|
||||
admin_group: ''
|
||||
sync_ssh_keys: false
|
||||
|
||||
staging:
|
||||
<<: *base
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user