Add a note that changing example configuration files requires changing omnibus-gitlab.
This commit is contained in:
parent
3de35168fd
commit
df346e9507
|
@ -1,5 +1,8 @@
|
||||||
# See https://github.com/jnicklas/carrierwave#using-amazon-s3
|
# See https://github.com/jnicklas/carrierwave#using-amazon-s3
|
||||||
# for more options
|
# for more options
|
||||||
|
# If you change this file in a Merge Request, please also create
|
||||||
|
# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
|
||||||
|
#
|
||||||
production:
|
production:
|
||||||
access_key_id: AKIA1111111111111UA
|
access_key_id: AKIA1111111111111UA
|
||||||
secret_access_key: secret
|
secret_access_key: secret
|
||||||
|
|
|
@ -4,9 +4,13 @@
|
||||||
#
|
#
|
||||||
########################### NOTE #####################################
|
########################### NOTE #####################################
|
||||||
# This file should not receive new settings. All configuration options #
|
# This file should not receive new settings. All configuration options #
|
||||||
# are being moved to ApplicationSetting model! #
|
# that do not require application restart are being moved to #
|
||||||
|
# ApplicationSetting model! #
|
||||||
|
# If you change this file in a Merge Request, please also create #
|
||||||
|
# a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests #
|
||||||
########################################################################
|
########################################################################
|
||||||
#
|
#
|
||||||
|
#
|
||||||
# How to use:
|
# How to use:
|
||||||
# 1. Copy file as gitlab.yml
|
# 1. Copy file as gitlab.yml
|
||||||
# 2. Update gitlab -> host with your fully qualified domain name
|
# 2. Update gitlab -> host with your fully qualified domain name
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
# 1. Rename this file to rack_attack.rb
|
# 1. Rename this file to rack_attack.rb
|
||||||
# 2. Review the paths_to_be_protected and add any other path you need protecting
|
# 2. Review the paths_to_be_protected and add any other path you need protecting
|
||||||
#
|
#
|
||||||
|
# If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
|
||||||
|
|
||||||
paths_to_be_protected = [
|
paths_to_be_protected = [
|
||||||
"#{Rails.application.config.relative_url_root}/users/password",
|
"#{Rails.application.config.relative_url_root}/users/password",
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#
|
#
|
||||||
# For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html
|
# For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html
|
||||||
#
|
#
|
||||||
|
# If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
|
||||||
|
|
||||||
if Rails.env.production?
|
if Rails.env.production?
|
||||||
Gitlab::Application.config.action_mailer.delivery_method = :smtp
|
Gitlab::Application.config.action_mailer.delivery_method = :smtp
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# If you change this file in a Merge Request, please also create
|
||||||
|
# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
|
||||||
|
#
|
||||||
development: redis://localhost:6379
|
development: redis://localhost:6379
|
||||||
test: redis://localhost:6379
|
test: redis://localhost:6379
|
||||||
production: unix:/var/run/redis/redis.sock
|
production: unix:/var/run/redis/redis.sock
|
||||||
|
|
|
@ -8,6 +8,9 @@
|
||||||
# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
|
# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
|
||||||
# documentation.
|
# documentation.
|
||||||
|
|
||||||
|
# Note: If you change this file in a Merge Request, please also create a
|
||||||
|
# Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
|
||||||
|
#
|
||||||
# WARNING: See config/application.rb under "Relative url support" for the list of
|
# WARNING: See config/application.rb under "Relative url support" for the list of
|
||||||
# other files that need to be changed for relative url support
|
# other files that need to be changed for relative url support
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,10 +1,16 @@
|
||||||
## GitLab
|
## GitLab
|
||||||
## Contributors: randx, yin8086, sashkab, orkoden, axilleas, bbodenmiller, DouweM
|
|
||||||
##
|
##
|
||||||
## Lines starting with two hashes (##) are comments with information.
|
## Lines starting with two hashes (##) are comments with information.
|
||||||
## Lines starting with one hash (#) are configuration parameters that can be uncommented.
|
## Lines starting with one hash (#) are configuration parameters that can be uncommented.
|
||||||
##
|
##
|
||||||
##################################
|
##################################
|
||||||
|
## CONTRIBUTING ##
|
||||||
|
##################################
|
||||||
|
##
|
||||||
|
## If you change this file in a Merge Request, please also create
|
||||||
|
## a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
|
||||||
|
##
|
||||||
|
##################################
|
||||||
## CHUNKED TRANSFER ##
|
## CHUNKED TRANSFER ##
|
||||||
##################################
|
##################################
|
||||||
##
|
##
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
## GitLab
|
## GitLab
|
||||||
## Contributors: randx, yin8086, sashkab, orkoden, axilleas, bbodenmiller, DouweM
|
|
||||||
##
|
##
|
||||||
## Modified from nginx http version
|
## Modified from nginx http version
|
||||||
## Modified from http://blog.phusion.nl/2012/04/21/tutorial-setting-up-gitlab-on-debian-6/
|
## Modified from http://blog.phusion.nl/2012/04/21/tutorial-setting-up-gitlab-on-debian-6/
|
||||||
|
@ -9,6 +8,13 @@
|
||||||
## Lines starting with one hash (#) are configuration parameters that can be uncommented.
|
## Lines starting with one hash (#) are configuration parameters that can be uncommented.
|
||||||
##
|
##
|
||||||
##################################
|
##################################
|
||||||
|
## CONTRIBUTING ##
|
||||||
|
##################################
|
||||||
|
##
|
||||||
|
## If you change this file in a Merge Request, please also create
|
||||||
|
## a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
|
||||||
|
##
|
||||||
|
##################################
|
||||||
## CHUNKED TRANSFER ##
|
## CHUNKED TRANSFER ##
|
||||||
##################################
|
##################################
|
||||||
##
|
##
|
||||||
|
|
Loading…
Reference in New Issue