Download as
Browse Code »

Commit e07a8018cc6c6189e945ed3fb637f253bd8147e4

Authored by Jacob Vosmaer
2 parents 4560a2dc 11cc82ec
Exists in master and in 4 other branches 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee

Merge branch 'templates_7.1' into 'master' 

Update templates for GitLab 7.1

See merge request !169
Showing 2 changed files with 25 additions and 13 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @e07a801
@@ -93,6 +93,7 @@ default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = nil @@ -93,6 +93,7 @@ default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = nil
93 default['gitlab']['gitlab-rails']['ldap_user_filter'] = nil 93 default['gitlab']['gitlab-rails']['ldap_user_filter'] = nil
94 default['gitlab']['gitlab-rails']['ldap_group_base'] = nil 94 default['gitlab']['gitlab-rails']['ldap_group_base'] = nil
95 default['gitlab']['gitlab-rails']['ldap_admin_group'] = nil 95 default['gitlab']['gitlab-rails']['ldap_admin_group'] = nil
  96 +default['gitlab']['gitlab-rails']['ldap_sync_ssh_keys'] = nil
96 default['gitlab']['gitlab-rails']['omniauth_enabled'] = false 97 default['gitlab']['gitlab-rails']['omniauth_enabled'] = false
97 default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = nil 98 default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = nil
98 default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = nil 99 default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = nil
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @e07a801
@@ -14,13 +14,13 @@ production: &base @@ -14,13 +14,13 @@ production: &base
14 port: <%= @gitlab_port %> 14 port: <%= @gitlab_port %>
15 https: <%= @gitlab_https %> 15 https: <%= @gitlab_https %>
16 16
17 - # Uncomment and customize the last line to run in a non-root path  
18 - # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.  
19 - # Note that four settings need to be changed for this to work.  
20 - # 1) In your application.rb file: config.relative_url_root = "/gitlab"  
21 - # 2) In your gitlab.yml file: relative_url_root: /gitlab  
22 - # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"  
23 - # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab" 17 + # Uncommment this line below if your ssh host is different from HTTP/HTTPS one
  18 + # (you'd obviously need to replace ssh.host_example.com with your own host).
  19 + # Otherwise, ssh host will be set to the `host:` value above
  20 + # ssh_host: ssh.host_example.com
  21 +
  22 + # WARNING: See config/application.rb under "Relative url support" for the list of
  23 + # other files that need to be changed for relative url support
24 # relative_url_root: /gitlab 24 # relative_url_root: /gitlab
25 25
26 # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') 26 # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
@@ -44,15 +44,16 @@ production: &amp;base @@ -44,15 +44,16 @@ production: &amp;base
44 ## COLOR = 5 44 ## COLOR = 5
45 default_theme: <%= @gitlab_default_theme %> # default: 2 45 default_theme: <%= @gitlab_default_theme %> # default: 2
46 46
47 -  
48 - ## Users management  
49 - # default: false - Account passwords are not sent via the email if signup is enabled. 47 + ## Users can create accounts
  48 + # This also allows normal users to sign up for accounts themselves
  49 + # default: false - By default GitLab administrators must create all new accounts
50 signup_enabled: <%= @gitlab_signup_enabled %> 50 signup_enabled: <%= @gitlab_signup_enabled %>
51 # 51 #
52 - # default: true - If set to false, standard login form won't be shown on the sign-in page 52 + ## Standard login settings
  53 + # The standard login can be disabled to force login via LDAP
  54 + # default: true - If set to false the standard login form won't be shown on the sign-in page
53 signin_enabled: <%= @gitlab_signin_enabled %> 55 signin_enabled: <%= @gitlab_signin_enabled %>
54 56
55 -  
56 # Restrict setting visibility levels for non-admin users. 57 # Restrict setting visibility levels for non-admin users.
57 # The default is to allow all levels. 58 # The default is to allow all levels.
58 restricted_visibility_levels: <%= @gitlab_restricted_visibility_levels unless @gitlab_restricted_visibility_levels.nil? %> 59 restricted_visibility_levels: <%= @gitlab_restricted_visibility_levels unless @gitlab_restricted_visibility_levels.nil? %>
@@ -161,8 +162,18 @@ production: &amp;base @@ -161,8 +162,18 @@ production: &amp;base
161 # 162 #
162 group_base: <%= single_quote(@ldap_group_base) %> 163 group_base: <%= single_quote(@ldap_group_base) %>
163 164
  165 + # LDAP group of users who should be admins in GitLab
  166 + #
  167 + # Ex. GLAdmins
  168 + #
164 admin_group: <%= single_quote(@ldap_admin_group) %> 169 admin_group: <%= single_quote(@ldap_admin_group) %>
165 170
  171 + # Name of attribute which holds a ssh public key of the user object.
  172 + # If false or nil, SSH key syncronisation will be disabled.
  173 + #
  174 + # Ex. sshpublickey
  175 + #
  176 + sync_ssh_keys: <%= single_quote(@ldap_sync_ssh_keys) %>
166 177
167 ## OmniAuth settings 178 ## OmniAuth settings
168 omniauth: 179 omniauth:
@@ -235,7 +246,7 @@ production: &amp;base @@ -235,7 +246,7 @@ production: &amp;base
235 # The next value is the maximum memory size grit can use 246 # The next value is the maximum memory size grit can use
236 # Given in number of bytes per git object (e.g. a commit) 247 # Given in number of bytes per git object (e.g. a commit)
237 # This value can be increased if you have very large commits 248 # This value can be increased if you have very large commits
238 - max_size: <%= @git_max_size %> # 5.megabytes 249 + max_size: <%= @git_max_size %>
239 # Git timeout to read a commit, in seconds 250 # Git timeout to read a commit, in seconds
240 timeout: <%= @git_timeout %> 251 timeout: <%= @git_timeout %>
241 252