Merge branch 'update_templates' into 'master'

Update Templates

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -54,10 +54,10 @@ default['gitlab']['gitlab-rails']['gitlab_https'] = false
 default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}"
 default['gitlab']['gitlab-rails']['gitlab_support_email'] = "support@localhost"
 default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10
-default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = true
-default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = true
-default['gitlab']['gitlab-rails']['gitlab_default_theme'] = 2
-default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = false
+default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil
+default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil
+default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil
+default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = nil
 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = true
 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = true
 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
 default['gitlab']['gitlab-rails']['issues_tracker_jira_issues_url'] = "http://jira.sample/browse/:id"
 default['gitlab']['gitlab-rails']['issues_tracker_jira_new_issue_url'] = "http://jira.sample/secure/CreateIssue.jspa"
 default['gitlab']['gitlab-rails']['gravatar_enabled'] = true
-default['gitlab']['gitlab-rails']['gravatar_plain_url'] = "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm"
-default['gitlab']['gitlab-rails']['gravatar_ssl_url'] = "https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm"
+default['gitlab']['gitlab-rails']['gravatar_plain_url'] = nil
+default['gitlab']['gitlab-rails']['gravatar_ssl_url'] = nil
 default['gitlab']['gitlab-rails']['ldap_enabled'] = false
 default['gitlab']['gitlab-rails']['ldap_host'] = "_your_ldap_server"
 default['gitlab']['gitlab-rails']['ldap_base'] = "_the_base_where_you_search_for_users"
@@ -90,7 +90,7 @@ default['gitlab']['gitlab-rails']['ldap_user_filter'] = ""
 default['gitlab']['gitlab-rails']['ldap_group_base'] = ""
 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites"
 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups"
-default['gitlab']['gitlab-rails']['backup_keep_time'] = 0
+default['gitlab']['gitlab-rails']['backup_keep_time'] = nil
 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/"
 default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/git-data/repositories"
 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
 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git"
 default['gitlab']['gitlab-rails']['git_max_size'] = 5242880
 default['gitlab']['gitlab-rails']['git_timeout'] = 10
-default['gitlab']['gitlab-rails']['extra'] =
 ####

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -43,7 +43,7 @@ production: &base
     ## User settings
     default_projects_limit: <%= @gitlab_default_projects_limit %>
     default_can_create_group: <%= @gitlab_default_can_create_group %>  # default: true
-    username_changing_enabled: <%= @username_changing_enabled %> # default: true - User can change her username/namespace
+    username_changing_enabled: <%= @gitlab_username_changing_enabled %> # default: true - User can change her username/namespace
     ## Default theme
     ##   BASIC  = 1
     ##   MARS   = 2
@@ -125,7 +125,6 @@ production: &base
   ldap:
     enabled: <%= @ldap_enabled %>
     host: '<%= @ldap_host %>'
-    base: '<%= @ldap_base %>'
     port: <%= @ldap_port %>
     uid: '<%= @ldap_uid %>'
     method: '<%= @ldap_method %>' # "tls" or "ssl" or "plain"
@@ -142,6 +141,12 @@ production: &base
     # disable this setting, because the userPrincipalName contains an '@'.
     allow_username_or_email_login: <%= @ldap_allow_username_or_email_login %>
+    # Base where we can search for users
+    #
+    #   Ex. ou=People,dc=gitlab,dc=example
+    #
+    base: '<%= @ldap_base %>'
+
     # Filter LDAP users
     #
     #   Format: RFC 4515
@@ -234,6 +239,10 @@ production: &base
     ## Google analytics. Uncomment if you want it
     # google_analytics_id: '_your_tracking_id'
+    ## Piwik analytics.
+    # piwik_url: '_your_piwik_url'
+    # piwik_site_id: '_your_piwik_site_id'
+
     ## Text under sign-in page (Markdown enabled)
     # sign_in_text: |
     #   ![Company Logo](http://www.companydomain.com/logo.png)

files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb

@@ -27,7 +27,7 @@ server {
   
   # Increase this if you want to upload large attachments
   # Or if you want to accept large git objects over http
-  client_max_body_size 5m;
+  client_max_body_size <%= @client_max_body_size %>;
   # individual nginx logs for this gitlab vhost
   access_log  <%= @log_directory %>/gitlab_access.log;