Commit dc354daf48273004e3236922a43aeb1117a3f7be
1 parent
d1caa2cb
Exists in
master
and in
13 other branches
Warn users not to manually edit templated files
Showing
12 changed files
with
46 additions
and
12 deletions
Show diff stats
files/gitlab-cookbooks/gitlab/templates/default/90-postgresql.conf.sysctl.erb
files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb
| 1 | +# This file is managed by gitlab-ctl. Manual changes will be | ||
| 2 | +# erased! To change the contents below, edit /etc/gitlab/gitlab.rb | ||
| 3 | +# and run `sudo gitlab-ctl reconfigure`. | ||
| 4 | + | ||
| 1 | production: | 5 | production: |
| 2 | adapter: <%= @db_adapter %> | 6 | adapter: <%= @db_adapter %> |
| 3 | encoding: <%= @db_encoding %> | 7 | encoding: <%= @db_encoding %> |
files/gitlab-cookbooks/gitlab/templates/default/gitconfig.erb
| 1 | +# This file is managed by gitlab-ctl. Manual changes will be | ||
| 2 | +# erased! To change the contents below, edit /etc/gitlab/gitlab.rb | ||
| 3 | +# and run `sudo gitlab-ctl reconfigure`. | ||
| 4 | + | ||
| 1 | [user] | 5 | [user] |
| 2 | name = <%= node['gitlab']['user']['git_user_name'] %> | 6 | name = <%= node['gitlab']['user']['git_user_name'] %> |
| 3 | email = <%= node['gitlab']['user']['git_user_email'] %> | 7 | email = <%= node['gitlab']['user']['git_user_email'] %> |
files/gitlab-cookbooks/gitlab/templates/default/gitlab-shell-config.yml.erb
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
| 1 | -# # # # # # # # # # # # # # # # # # | ||
| 2 | -# GitLab application config file # | ||
| 3 | -# # # # # # # # # # # # # # # # # # | ||
| 4 | -# | ||
| 5 | -# How to use: | ||
| 6 | -# 1. copy file as gitlab.yml | ||
| 7 | -# 2. Replace gitlab -> host with your domain | ||
| 8 | -# 3. Replace gitlab -> email_from | 1 | +# This file is managed by gitlab-ctl. Manual changes will be |
| 2 | +# erased! To change the contents below, edit /etc/gitlab/gitlab.rb | ||
| 3 | +# and run `sudo gitlab-ctl reconfigure`. | ||
| 9 | 4 | ||
| 10 | production: &base | 5 | production: &base |
| 11 | # | 6 | # |
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
| 1 | +# This file is managed by gitlab-ctl. Manual changes will be | ||
| 2 | +# erased! To change the contents below, edit /etc/gitlab/gitlab.rb | ||
| 3 | +# and run `sudo gitlab-ctl reconfigure`. | ||
| 4 | + | ||
| 1 | user <%= node['gitlab']['user']['username'] %> <%= node['gitlab']['user']['username']%>; | 5 | user <%= node['gitlab']['user']['username'] %> <%= node['gitlab']['user']['username']%>; |
| 2 | worker_processes <%= @worker_processes %>; | 6 | worker_processes <%= @worker_processes %>; |
| 3 | error_log /var/log/gitlab/nginx/error.log; | 7 | error_log /var/log/gitlab/nginx/error.log; |
files/gitlab-cookbooks/gitlab/templates/default/pg_hba.conf.erb
| 1 | +# This file is managed by gitlab-ctl. Manual changes will be | ||
| 2 | +# erased! To change the contents below, edit /etc/gitlab/gitlab.rb | ||
| 3 | +# and run `sudo gitlab-ctl reconfigure`. | ||
| 4 | + | ||
| 1 | # PostgreSQL Client Authentication Configuration File | 5 | # PostgreSQL Client Authentication Configuration File |
| 2 | # =================================================== | 6 | # =================================================== |
| 3 | # | 7 | # |
files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb
| 1 | +# This file is managed by gitlab-ctl. Manual changes will be | ||
| 2 | +# erased! To change the contents below, edit /etc/gitlab/gitlab.rb | ||
| 3 | +# and run `sudo gitlab-ctl reconfigure`. | ||
| 4 | + | ||
| 1 | # ----------------------------- | 5 | # ----------------------------- |
| 2 | # PostgreSQL configuration file | 6 | # PostgreSQL configuration file |
| 3 | # ----------------------------- | 7 | # ----------------------------- |
files/gitlab-cookbooks/gitlab/templates/default/rack_attack.rb.erb
| 1 | +# This file is managed by gitlab-ctl. Manual changes will be | ||
| 2 | +# erased! To change the contents below, edit /etc/gitlab/gitlab.rb | ||
| 3 | +# and run `sudo gitlab-ctl reconfigure`. | ||
| 4 | + | ||
| 1 | # 1. Rename this file to rack_attack.rb | 5 | # 1. Rename this file to rack_attack.rb |
| 2 | # 2. Review the paths_to_be_protected and add any other path you need protecting | 6 | # 2. Review the paths_to_be_protected and add any other path you need protecting |
| 3 | # | 7 | # |
files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb
| 1 | +# This file is managed by gitlab-ctl. Manual changes will be | ||
| 2 | +# erased! To change the contents below, edit /etc/gitlab/gitlab.rb | ||
| 3 | +# and run `sudo gitlab-ctl reconfigure`. | ||
| 4 | + | ||
| 1 | # Redis configuration file example | 5 | # Redis configuration file example |
| 2 | 6 | ||
| 3 | # Note on units: when memory size is needed, it is possible to specify | 7 | # Note on units: when memory size is needed, it is possible to specify |
files/gitlab-cookbooks/gitlab/templates/default/unicorn.rb.erb
| 1 | -## | ||
| 2 | -# Unicorn config at <%= @name %> | ||
| 3 | -# Managed by Chef - Local Changes will be Nuked from Orbit (just to be sure) | ||
| 4 | -## | 1 | +# This file is managed by gitlab-ctl. Manual changes will be |
| 2 | +# erased! To change the contents below, edit /etc/gitlab/gitlab.rb | ||
| 3 | +# and run `sudo gitlab-ctl reconfigure`. | ||
| 4 | + | ||
| 5 | 5 | ||
| 6 | # What ports/sockets to listen on, and what options for them. | 6 | # What ports/sockets to listen on, and what options for them. |
| 7 | <%- @listen.each do |port, options| %> | 7 | <%- @listen.each do |port, options| %> |