Download as
Browse Code »

Commit a902d7fe207d27d0916f892de6fb0a403cbb633c

Authored by Jacob Vosmaer
2 parents 11a49ac4 c41793cb
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Merge branch 'gitlab.yml_defaults' into 'master' 

Defer more gitlab.yml defaults to upstream

See merge request !183
Showing 3 changed files with 15 additions and 14 deletions   Show diff stats
@@ -10,6 +10,7 @@ omnibus-gitlab repository. @@ -10,6 +10,7 @@ omnibus-gitlab repository.
10 - Create git's home directory if necessary 10 - Create git's home directory if necessary
11 - Update openssl to 1.0.1i 11 - Update openssl to 1.0.1i
12 - Fix missing sidekiq.log in the GitLab admin interface 12 - Fix missing sidekiq.log in the GitLab admin interface
  13 +- Defer more gitlab.yml defaults to upstream
13 14
14 7.1.0 15 7.1.0
15 - Build: explicitly use .forward for sending notifications 16 - Build: explicitly use .forward for sending notifications
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @a902d7f
@@ -55,20 +55,20 @@ default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn'] @@ -55,20 +55,20 @@ default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn']
55 default['gitlab']['gitlab-rails']['gitlab_port'] = 80 55 default['gitlab']['gitlab-rails']['gitlab_port'] = 80
56 default['gitlab']['gitlab-rails']['gitlab_https'] = false 56 default['gitlab']['gitlab-rails']['gitlab_https'] = false
57 default['gitlab']['gitlab-rails']['gitlab_ssh_host'] = nil 57 default['gitlab']['gitlab-rails']['gitlab_ssh_host'] = nil
58 -default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}"  
59 -default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10 58 +default['gitlab']['gitlab-rails']['gitlab_email_from'] = nil
  59 +default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = nil
60 default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil 60 default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil
61 default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil 61 default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil
62 default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil 62 default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil
63 default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = nil 63 default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = nil
64 default['gitlab']['gitlab-rails']['gitlab_signin_enabled'] = nil 64 default['gitlab']['gitlab-rails']['gitlab_signin_enabled'] = nil
65 default['gitlab']['gitlab-rails']['gitlab_restricted_visibility_levels'] = nil 65 default['gitlab']['gitlab-rails']['gitlab_restricted_visibility_levels'] = nil
66 -default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = true  
67 -default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = true  
68 -default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = true  
69 -default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wall'] = false  
70 -default['gitlab']['gitlab-rails']['gitlab_default_projects_features_snippets'] = false  
71 -default['gitlab']['gitlab-rails']['gitlab_default_projects_features_visibility_level'] = "private" 66 +default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = nil
  67 +default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = nil
  68 +default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = nil
  69 +default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wall'] = nil
  70 +default['gitlab']['gitlab-rails']['gitlab_default_projects_features_snippets'] = nil
  71 +default['gitlab']['gitlab-rails']['gitlab_default_projects_features_visibility_level'] = nil
72 default['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'] = nil 72 default['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'] = nil
73 default['gitlab']['gitlab-rails']['issues_tracker_redmine'] = false 73 default['gitlab']['gitlab-rails']['issues_tracker_redmine'] = false
74 default['gitlab']['gitlab-rails']['issues_tracker_redmine_title'] = "Redmine" 74 default['gitlab']['gitlab-rails']['issues_tracker_redmine_title'] = "Redmine"
@@ -106,12 +106,12 @@ default['gitlab']['gitlab-rails']['backup_keep_time'] = nil @@ -106,12 +106,12 @@ default['gitlab']['gitlab-rails']['backup_keep_time'] = nil
106 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/" 106 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/"
107 default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/git-data/repositories" 107 default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/git-data/repositories"
108 default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/" 108 default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/"
109 -default['gitlab']['gitlab-rails']['gitlab_shell_upload_pack'] = true  
110 -default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = true  
111 -default['gitlab']['gitlab-rails']['gitlab_shell_ssh_port'] = 22 109 +default['gitlab']['gitlab-rails']['gitlab_shell_upload_pack'] = nil
  110 +default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = nil
  111 +default['gitlab']['gitlab-rails']['gitlab_shell_ssh_port'] = nil
112 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git" 112 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git"
113 -default['gitlab']['gitlab-rails']['git_max_size'] = 20971520 # 20 MB  
114 -default['gitlab']['gitlab-rails']['git_timeout'] = 10 113 +default['gitlab']['gitlab-rails']['git_max_size'] = nil
  114 +default['gitlab']['gitlab-rails']['git_timeout'] = nil
115 default['gitlab']['gitlab-rails']['extra_google_analytics_id'] = nil 115 default['gitlab']['gitlab-rails']['extra_google_analytics_id'] = nil
116 default['gitlab']['gitlab-rails']['extra_piwik_url'] = nil 116 default['gitlab']['gitlab-rails']['extra_piwik_url'] = nil
117 default['gitlab']['gitlab-rails']['extra_piwik_site_id'] = nil 117 default['gitlab']['gitlab-rails']['extra_piwik_site_id'] = nil
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @a902d7f
@@ -70,7 +70,7 @@ production: &base @@ -70,7 +70,7 @@ production: &base
70 merge_requests: <%= @gitlab_default_projects_features_merge_requests %> 70 merge_requests: <%= @gitlab_default_projects_features_merge_requests %>
71 wiki: <%= @gitlab_default_projects_features_wiki %> 71 wiki: <%= @gitlab_default_projects_features_wiki %>
72 snippets: <%= @gitlab_default_projects_features_snippets %> 72 snippets: <%= @gitlab_default_projects_features_snippets %>
73 - visibility_level: "<%= @gitlab_default_projects_features_visibility_level %>" # can be "private" | "internal" | "public" 73 + visibility_level: <%= single_quote(@gitlab_default_projects_features_visibility_level) %> # can be "private" | "internal" | "public"
74 74
75 ## Repository downloads directory 75 ## Repository downloads directory
76 # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory. 76 # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.