Download as
Browse Code »

Commit 649ca0b791ed66c0fb23e506d0fa774ba281e368

Authored by Jacob Vosmaer
2 parents cca12152 71b41529
Exists in master and in 15 other branches 6-7-stable, 6-7-stable-ee, 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 'update_templates' into 'master' 

Update Templates
Showing 3 changed files with 19 additions and 11 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @649ca0b
@@ -54,10 +54,10 @@ default['gitlab']['gitlab-rails']['gitlab_https'] = false @@ -54,10 +54,10 @@ default['gitlab']['gitlab-rails']['gitlab_https'] = false
54 default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}" 54 default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}"
55 default['gitlab']['gitlab-rails']['gitlab_support_email'] = "support@localhost" 55 default['gitlab']['gitlab-rails']['gitlab_support_email'] = "support@localhost"
56 default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10 56 default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10
57 -default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = true  
58 -default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = true  
59 -default['gitlab']['gitlab-rails']['gitlab_default_theme'] = 2  
60 -default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = false 57 +default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil
  58 +default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil
  59 +default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil
  60 +default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = nil
61 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = true 61 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = true
62 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = true 62 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = true
63 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = true 63 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = true
@@ -75,8 +75,8 @@ default['gitlab']['gitlab-rails']['issues_tracker_jira_project_url'] = "http://j @@ -75,8 +75,8 @@ default['gitlab']['gitlab-rails']['issues_tracker_jira_project_url'] = "http://j
75 default['gitlab']['gitlab-rails']['issues_tracker_jira_issues_url'] = "http://jira.sample/browse/:id" 75 default['gitlab']['gitlab-rails']['issues_tracker_jira_issues_url'] = "http://jira.sample/browse/:id"
76 default['gitlab']['gitlab-rails']['issues_tracker_jira_new_issue_url'] = "http://jira.sample/secure/CreateIssue.jspa" 76 default['gitlab']['gitlab-rails']['issues_tracker_jira_new_issue_url'] = "http://jira.sample/secure/CreateIssue.jspa"
77 default['gitlab']['gitlab-rails']['gravatar_enabled'] = true 77 default['gitlab']['gitlab-rails']['gravatar_enabled'] = true
78 -default['gitlab']['gitlab-rails']['gravatar_plain_url'] = "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm"  
79 -default['gitlab']['gitlab-rails']['gravatar_ssl_url'] = "https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm" 78 +default['gitlab']['gitlab-rails']['gravatar_plain_url'] = nil
  79 +default['gitlab']['gitlab-rails']['gravatar_ssl_url'] = nil
80 default['gitlab']['gitlab-rails']['ldap_enabled'] = false 80 default['gitlab']['gitlab-rails']['ldap_enabled'] = false
81 default['gitlab']['gitlab-rails']['ldap_host'] = "_your_ldap_server" 81 default['gitlab']['gitlab-rails']['ldap_host'] = "_your_ldap_server"
82 default['gitlab']['gitlab-rails']['ldap_base'] = "_the_base_where_you_search_for_users" 82 default['gitlab']['gitlab-rails']['ldap_base'] = "_the_base_where_you_search_for_users"
@@ -90,7 +90,7 @@ default['gitlab']['gitlab-rails']['ldap_user_filter'] = "" @@ -90,7 +90,7 @@ default['gitlab']['gitlab-rails']['ldap_user_filter'] = ""
90 default['gitlab']['gitlab-rails']['ldap_group_base'] = "" 90 default['gitlab']['gitlab-rails']['ldap_group_base'] = ""
91 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites" 91 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites"
92 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups" 92 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups"
93 -default['gitlab']['gitlab-rails']['backup_keep_time'] = 0 93 +default['gitlab']['gitlab-rails']['backup_keep_time'] = nil
94 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/" 94 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/"
95 default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/git-data/repositories" 95 default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/git-data/repositories"
96 default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/" 96 default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/"
@@ -99,7 +99,6 @@ default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = true @@ -99,7 +99,6 @@ default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = true
99 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git" 99 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git"
100 default['gitlab']['gitlab-rails']['git_max_size'] = 5242880 100 default['gitlab']['gitlab-rails']['git_max_size'] = 5242880
101 default['gitlab']['gitlab-rails']['git_timeout'] = 10 101 default['gitlab']['gitlab-rails']['git_timeout'] = 10
102 -default['gitlab']['gitlab-rails']['extra'] =  
103 102
104 103
105 #### 104 ####
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @649ca0b
@@ -43,7 +43,7 @@ production: &base @@ -43,7 +43,7 @@ production: &base
43 ## User settings 43 ## User settings
44 default_projects_limit: <%= @gitlab_default_projects_limit %> 44 default_projects_limit: <%= @gitlab_default_projects_limit %>
45 default_can_create_group: <%= @gitlab_default_can_create_group %> # default: true 45 default_can_create_group: <%= @gitlab_default_can_create_group %> # default: true
46 - username_changing_enabled: <%= @username_changing_enabled %> # default: true - User can change her username/namespace 46 + username_changing_enabled: <%= @gitlab_username_changing_enabled %> # default: true - User can change her username/namespace
47 ## Default theme 47 ## Default theme
48 ## BASIC = 1 48 ## BASIC = 1
49 ## MARS = 2 49 ## MARS = 2
@@ -125,7 +125,6 @@ production: &amp;base @@ -125,7 +125,6 @@ production: &amp;base
125 ldap: 125 ldap:
126 enabled: <%= @ldap_enabled %> 126 enabled: <%= @ldap_enabled %>
127 host: '<%= @ldap_host %>' 127 host: '<%= @ldap_host %>'
128 - base: '<%= @ldap_base %>'  
129 port: <%= @ldap_port %> 128 port: <%= @ldap_port %>
130 uid: '<%= @ldap_uid %>' 129 uid: '<%= @ldap_uid %>'
131 method: '<%= @ldap_method %>' # "tls" or "ssl" or "plain" 130 method: '<%= @ldap_method %>' # "tls" or "ssl" or "plain"
@@ -142,6 +141,12 @@ production: &amp;base @@ -142,6 +141,12 @@ production: &amp;base
142 # disable this setting, because the userPrincipalName contains an '@'. 141 # disable this setting, because the userPrincipalName contains an '@'.
143 allow_username_or_email_login: <%= @ldap_allow_username_or_email_login %> 142 allow_username_or_email_login: <%= @ldap_allow_username_or_email_login %>
144 143
  144 + # Base where we can search for users
  145 + #
  146 + # Ex. ou=People,dc=gitlab,dc=example
  147 + #
  148 + base: '<%= @ldap_base %>'
  149 +
145 # Filter LDAP users 150 # Filter LDAP users
146 # 151 #
147 # Format: RFC 4515 152 # Format: RFC 4515
@@ -234,6 +239,10 @@ production: &amp;base @@ -234,6 +239,10 @@ production: &amp;base
234 ## Google analytics. Uncomment if you want it 239 ## Google analytics. Uncomment if you want it
235 # google_analytics_id: '_your_tracking_id' 240 # google_analytics_id: '_your_tracking_id'
236 241
  242 + ## Piwik analytics.
  243 + # piwik_url: '_your_piwik_url'
  244 + # piwik_site_id: '_your_piwik_site_id'
  245 +
237 ## Text under sign-in page (Markdown enabled) 246 ## Text under sign-in page (Markdown enabled)
238 # sign_in_text: | 247 # sign_in_text: |
239 # ![Company Logo](http://www.companydomain.com/logo.png) 248 # ![Company Logo](http://www.companydomain.com/logo.png)
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
  Diff comments   View file @649ca0b
@@ -27,7 +27,7 @@ server { @@ -27,7 +27,7 @@ server {
27 27
28 # Increase this if you want to upload large attachments 28 # Increase this if you want to upload large attachments
29 # Or if you want to accept large git objects over http 29 # Or if you want to accept large git objects over http
30 - client_max_body_size 5m; 30 + client_max_body_size <%= @client_max_body_size %>;
31 31
32 # individual nginx logs for this gitlab vhost 32 # individual nginx logs for this gitlab vhost
33 access_log <%= @log_directory %>/gitlab_access.log; 33 access_log <%= @log_directory %>/gitlab_access.log;