summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/aws.yml.example3
-rw-r--r--config/gitlab.yml.example8
-rw-r--r--config/initializers/rack_attack.rb.example1
-rw-r--r--config/initializers/smtp_settings.rb.sample1
-rw-r--r--config/resque.yml.example3
-rw-r--r--config/unicorn.rb.example3
-rw-r--r--lib/support/nginx/gitlab8
-rw-r--r--lib/support/nginx/gitlab-ssl8
8 files changed, 31 insertions, 4 deletions
diff --git a/config/aws.yml.example b/config/aws.yml.example
index 29d029b078d..bb10c3cec7b 100644
--- a/config/aws.yml.example
+++ b/config/aws.yml.example
@@ -1,5 +1,8 @@
# See https://github.com/jnicklas/carrierwave#using-amazon-s3
# 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:
access_key_id: AKIA1111111111111UA
secret_access_key: secret
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index f48c99fd901..96b6ed01f42 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -4,9 +4,13 @@
#
########################### NOTE #####################################
# 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:
# 1. Copy file as gitlab.yml
# 2. Update gitlab -> host with your fully qualified domain name
@@ -149,7 +153,7 @@ production: &base
allow_username_or_email_login: false
# To maintain tight control over the number of active users on your GitLab installation,
- # enable this setting to keep new users blocked until they have been cleared by the admin
+ # enable this setting to keep new users blocked until they have been cleared by the admin
# (default: false).
block_auto_created_users: false
diff --git a/config/initializers/rack_attack.rb.example b/config/initializers/rack_attack.rb.example
index 332865d2881..b1bbcca1d61 100644
--- a/config/initializers/rack_attack.rb.example
+++ b/config/initializers/rack_attack.rb.example
@@ -1,6 +1,7 @@
# 1. Rename this file to rack_attack.rb
# 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 = [
"#{Rails.application.config.relative_url_root}/users/password",
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample
index f0fe2fdfa43..25ec247a095 100644
--- a/config/initializers/smtp_settings.rb.sample
+++ b/config/initializers/smtp_settings.rb.sample
@@ -5,6 +5,7 @@
#
# 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?
Gitlab::Application.config.action_mailer.delivery_method = :smtp
diff --git a/config/resque.yml.example b/config/resque.yml.example
index 347f3599b20..d98f43f71b2 100644
--- a/config/resque.yml.example
+++ b/config/resque.yml.example
@@ -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
test: redis://localhost:6379
production: unix:/var/run/redis/redis.sock
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index 86a5512e761..b937b092789 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -8,6 +8,9 @@
# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
# 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
# other files that need to be changed for relative url support
#
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 62a4276536c..4688a527eba 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -1,10 +1,16 @@
## GitLab
-## Contributors: randx, yin8086, sashkab, orkoden, axilleas, bbodenmiller, DouweM
##
## Lines starting with two hashes (##) are comments with information.
## 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 ##
##################################
##
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index 2aefc944698..187a27e93b0 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -1,5 +1,4 @@
## GitLab
-## Contributors: randx, yin8086, sashkab, orkoden, axilleas, bbodenmiller, DouweM
##
## Modified from nginx http version
## 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.
##
##################################
+## 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 ##
##################################
##