Download as
Browse Code »

Commit 497a2096791839a044e582e83ae17f1c82d5700f

Authored by Sytse Sijbrandij
2 parents f3e77843 dc354daf
Exists in master and in 13 other branches 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'template_warnings' into 'master' 

Add warnings to templates
Showing 12 changed files with 46 additions and 12 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/templates/default/90-postgresql.conf.sysctl.erb
  Diff comments   View file @497a209
  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`.
1 4 #
2 5 # gitlab postgresql kernel shm tweaks
3 6 #
... ...
files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb
  Diff comments   View file @497a209
  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 production:
2 6 adapter: <%= @db_adapter %>
3 7 encoding: <%= @db_encoding %>
... ...
files/gitlab-cookbooks/gitlab/templates/default/gitconfig.erb
  Diff comments   View file @497a209
  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 [user]
2 6 name = <%= node['gitlab']['user']['git_user_name'] %>
3 7 email = <%= node['gitlab']['user']['git_user_email'] %>
... ...
files/gitlab-cookbooks/gitlab/templates/default/gitlab-shell-config.yml.erb
  Diff comments   View file @497a209
  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 # GitLab user. git by default
2 6 user: <%= @user %>
3 7  
... ...
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @497a209
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 5 production: &base
11 6 #
... ...
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
  Diff comments   View file @497a209
  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 # GITLAB
2 6 # Maintainer: @randx
3 7  
... ...
files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
  Diff comments   View file @497a209
  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 user <%= node['gitlab']['user']['username'] %> <%= node['gitlab']['user']['username']%>;
2 6 worker_processes <%= @worker_processes %>;
3 7 error_log /var/log/gitlab/nginx/error.log;
... ...
files/gitlab-cookbooks/gitlab/templates/default/pg_hba.conf.erb
  Diff comments   View file @497a209
  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 # PostgreSQL Client Authentication Configuration File
2 6 # ===================================================
3 7 #
... ...
files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb
  Diff comments   View file @497a209
  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 6 # PostgreSQL configuration file
3 7 # -----------------------------
... ...
files/gitlab-cookbooks/gitlab/templates/default/rack_attack.rb.erb
  Diff comments   View file @497a209
  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 # 1. Rename this file to rack_attack.rb
2 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
  Diff comments   View file @497a209
  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 # Redis configuration file example
2 6  
3 7 # Note on units: when memory size is needed, it is possible to specify
... ...
files/gitlab-cookbooks/gitlab/templates/default/unicorn.rb.erb
  Diff comments   View file @497a209
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 6 # What ports/sockets to listen on, and what options for them.
7 7 <%- @listen.each do |port, options| %>
... ...