From c41793cb5ca45724c7549e2ed1e6c621798da6be Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 15 Aug 2014 11:36:59 +0200
Subject: [PATCH] Defer more gitlab.yml defaults to upstream

---
 CHANGELOG                                                      |  1 +
 files/gitlab-cookbooks/gitlab/attributes/default.rb            | 26 +++++++++++++-------------
 files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7ee90b0..d591241 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ omnibus-gitlab repository.
 - Create git's home directory if necessary
 - Update openssl to 1.0.1i
 - Fix missing sidekiq.log in the GitLab admin interface
+- Defer more gitlab.yml defaults to upstream
 
 7.1.0
 - Build: explicitly use .forward for sending notifications
diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index 6bec643..779ab44 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -55,20 +55,20 @@ default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn']
 default['gitlab']['gitlab-rails']['gitlab_port'] = 80
 default['gitlab']['gitlab-rails']['gitlab_https'] = false
 default['gitlab']['gitlab-rails']['gitlab_ssh_host'] = nil
-default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}"
-default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10
+default['gitlab']['gitlab-rails']['gitlab_email_from'] = nil
+default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = nil
 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_signin_enabled'] = nil
 default['gitlab']['gitlab-rails']['gitlab_restricted_visibility_levels'] = 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
-default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wall'] = false
-default['gitlab']['gitlab-rails']['gitlab_default_projects_features_snippets'] = false
-default['gitlab']['gitlab-rails']['gitlab_default_projects_features_visibility_level'] = "private"
+default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = nil
+default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = nil
+default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = nil
+default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wall'] = nil
+default['gitlab']['gitlab-rails']['gitlab_default_projects_features_snippets'] = nil
+default['gitlab']['gitlab-rails']['gitlab_default_projects_features_visibility_level'] = nil
 default['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'] = nil
 default['gitlab']['gitlab-rails']['issues_tracker_redmine'] = false
 default['gitlab']['gitlab-rails']['issues_tracker_redmine_title'] = "Redmine"
@@ -106,12 +106,12 @@ 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/"
-default['gitlab']['gitlab-rails']['gitlab_shell_upload_pack'] = true
-default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = true
-default['gitlab']['gitlab-rails']['gitlab_shell_ssh_port'] = 22
+default['gitlab']['gitlab-rails']['gitlab_shell_upload_pack'] = nil
+default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = nil
+default['gitlab']['gitlab-rails']['gitlab_shell_ssh_port'] = nil
 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git"
-default['gitlab']['gitlab-rails']['git_max_size'] = 20971520 # 20 MB
-default['gitlab']['gitlab-rails']['git_timeout'] = 10
+default['gitlab']['gitlab-rails']['git_max_size'] = nil
+default['gitlab']['gitlab-rails']['git_timeout'] = nil
 default['gitlab']['gitlab-rails']['extra_google_analytics_id'] = nil
 default['gitlab']['gitlab-rails']['extra_piwik_url'] = nil
 default['gitlab']['gitlab-rails']['extra_piwik_site_id'] = nil
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
index c2dce52..3fa251c 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -70,7 +70,7 @@ production: &base
       merge_requests: <%= @gitlab_default_projects_features_merge_requests %>
       wiki: <%= @gitlab_default_projects_features_wiki %>
       snippets: <%= @gitlab_default_projects_features_snippets %>
-      visibility_level: "<%= @gitlab_default_projects_features_visibility_level %>"  # can be "private" | "internal" | "public"
+      visibility_level: <%= single_quote(@gitlab_default_projects_features_visibility_level) %>  # can be "private" | "internal" | "public"
 
     ## Repository downloads directory
     # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
--
libgit2 0.21.2