use environemnt variables
This commit is contained in:
parent
a0fee04300
commit
e50a5a702d
2 changed files with 10 additions and 5 deletions
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -5,6 +5,7 @@ gitlab (8.4.0+dfsg~rc2-3) UNRELEASED; urgency=medium
|
|||
* Add nginx to dependencies (Closes: #812724)
|
||||
* Add ruby-influxdb to dependencies (Closes: #812839)
|
||||
* Add missing dependecies from Gemfile and tighen versions
|
||||
* Use environmental variables by commenting out defaults in gitlab.yml
|
||||
|
||||
-- Pirate Praveen <praveen@debian.org> Mon, 25 Jan 2016 07:56:09 +0530
|
||||
|
||||
|
|
14
debian/conf/gitlab.yml
vendored
14
debian/conf/gitlab.yml
vendored
|
@ -21,6 +21,8 @@
|
|||
# result in various issues such as failures of GitLab CI builds.
|
||||
# 5. Review this configuration file for other settings you may want to adjust
|
||||
|
||||
# For Debian specific changes: See /usr/share/doc/README.Debian
|
||||
|
||||
production: &base
|
||||
#
|
||||
# 1. GitLab app settings
|
||||
|
@ -29,8 +31,9 @@ production: &base
|
|||
## GitLab settings
|
||||
gitlab:
|
||||
## Web server settings (note: host is the FQDN, do not include http://)
|
||||
host: localhost
|
||||
port: 80 # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
|
||||
# Using environmental variables from /etc/gitlab/gitlab-debian.conf
|
||||
#host: localhost
|
||||
#port: 80 # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
|
||||
https: false # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
|
||||
|
||||
# Uncommment this line below if your ssh host is different from HTTP/HTTPS one
|
||||
|
@ -55,9 +58,10 @@ production: &base
|
|||
# Uncomment and set to false if you need to disable email sending from GitLab (default: true)
|
||||
# email_enabled: true
|
||||
# Email address used in the "From" field in mails sent by GitLab
|
||||
email_from: example@example.com
|
||||
email_display_name: GitLab
|
||||
email_reply_to: noreply@example.com
|
||||
# Using environmental variables from /etc/gitlab/gitlab-debian.conf
|
||||
# email_from: example@example.com
|
||||
# email_display_name: GitLab
|
||||
# email_reply_to: noreply@example.com
|
||||
|
||||
# Email server smtp settings are in config/initializers/smtp_settings.rb.sample
|
||||
|
||||
|
|
Loading…
Reference in a new issue