Download as
Browse Code »

Commit 3d13922e3869abdcee122291e6bef7177c02ada2

Authored by Jacob Vosmaer
1 parent cca12152
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

Use nils to get upstream defaults

Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @3d13922
@@ -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/"