Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
df346e95
Commit
df346e95
authored
Jun 11, 2015
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a note that changing example configuration files requires changing omnibus-gitlab.
parent
3de35168
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
31 additions
and
4 deletions
+31
-4
config/aws.yml.example
config/aws.yml.example
+3
-0
config/gitlab.yml.example
config/gitlab.yml.example
+6
-2
config/initializers/rack_attack.rb.example
config/initializers/rack_attack.rb.example
+1
-0
config/initializers/smtp_settings.rb.sample
config/initializers/smtp_settings.rb.sample
+1
-0
config/resque.yml.example
config/resque.yml.example
+3
-0
config/unicorn.rb.example
config/unicorn.rb.example
+3
-0
lib/support/nginx/gitlab
lib/support/nginx/gitlab
+7
-1
lib/support/nginx/gitlab-ssl
lib/support/nginx/gitlab-ssl
+7
-1
No files found.
config/aws.yml.example
View file @
df346e95
# 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
...
...
config/gitlab.yml.example
View file @
df346e95
...
@@ -4,9 +4,13 @@
...
@@ -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
...
@@ -149,7 +153,7 @@ production: &base
...
@@ -149,7 +153,7 @@ production: &base
allow_username_or_email_login: false
allow_username_or_email_login: false
# To maintain tight control over the number of active users on your GitLab installation,
# 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).
# (default: false).
block_auto_created_users: false
block_auto_created_users: false
...
...
config/initializers/rack_attack.rb.example
View file @
df346e95
# 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",
...
...
config/initializers/smtp_settings.rb.sample
View file @
df346e95
...
@@ -5,6 +5,7 @@
...
@@ -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
...
...
config/resque.yml.example
View file @
df346e95
# 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
config/unicorn.rb.example
View file @
df346e95
...
@@ -8,6 +8,9 @@
...
@@ -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
#
#
...
...
lib/support/nginx/gitlab
View file @
df346e95
## 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 ##
##################################
##################################
##
##
...
...
lib/support/nginx/gitlab-ssl
View file @
df346e95
## 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 @@
...
@@ -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 ##
##################################
##################################
##
##
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment