Download as
Browse Code »

Commit 2686a1cf0c34f80e77f79c0a446136d59aab1710

Authored by Jacob Vosmaer
1 parent d3b95e2a
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 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

Be careful when copy-pasting from a diff

Showing 1 changed file with 23 additions and 23 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @2686a1c
@@ -28,29 +28,29 @@ default['gitlab']['user']['shell'] = "/bin/sh" @@ -28,29 +28,29 @@ default['gitlab']['user']['shell'] = "/bin/sh"
28 # The home directory for the chef services user 28 # The home directory for the chef services user
29 default['gitlab']['user']['home'] = "/var/opt/gitlab" 29 default['gitlab']['user']['home'] = "/var/opt/gitlab"
30 30
31 --####  
32 --# GitLab core  
33 --####  
34 --default['gitlab']['gitlab-core']['enable'] = true  
35 --default['gitlab']['gitlab-core']['ha'] = false  
36 --default['gitlab']['gitlab-core']['dir'] = "/var/opt/gitlab/gitlab-core"  
37 --default['gitlab']['gitlab-core']['log_directory'] = "/var/log/gitlab/gitlab-core"  
38 --default['gitlab']['gitlab-core']['environment'] = 'production'  
39 --default['gitlab']['gitlab-core']['listen'] = '127.0.0.1'  
40 --default['gitlab']['gitlab-core']['vip'] = '127.0.0.1'  
41 --default['gitlab']['gitlab-core']['port'] = 9462  
42 --default['gitlab']['gitlab-core']['backlog'] = 1024  
43 --default['gitlab']['gitlab-core']['tcp_nodelay'] = true  
44 --default['gitlab']['gitlab-core']['worker_timeout'] = 3600  
45 --default['gitlab']['gitlab-core']['umask'] = "0022"  
46 --default['gitlab']['gitlab-core']['worker_processes'] = 2  
47 --default['gitlab']['gitlab-core']['session_key'] = "_sandbox_session"  
48 --default['gitlab']['gitlab-core']['cookie_domain'] = "all"  
49 --default['gitlab']['gitlab-core']['cookie_secret'] = "47b3b8d95dea455baf32155e95d1e64e"  
50 --default['gitlab']['gitlab-core']['web_ui_client_name'] = "chef-webui"  
51 --default['gitlab']['gitlab-core']['web_ui_admin_user_name'] = "admin"  
52 --default['gitlab']['gitlab-core']['web_ui_admin_default_password'] = "p@ssw0rd1"  
53 -- 31 +####
  32 +# GitLab core
  33 +####
  34 +default['gitlab']['gitlab-core']['enable'] = true
  35 +default['gitlab']['gitlab-core']['ha'] = false
  36 +default['gitlab']['gitlab-core']['dir'] = "/var/opt/gitlab/gitlab-core"
  37 +default['gitlab']['gitlab-core']['log_directory'] = "/var/log/gitlab/gitlab-core"
  38 +default['gitlab']['gitlab-core']['environment'] = 'production'
  39 +default['gitlab']['gitlab-core']['listen'] = '127.0.0.1'
  40 +default['gitlab']['gitlab-core']['vip'] = '127.0.0.1'
  41 +default['gitlab']['gitlab-core']['port'] = 9462
  42 +default['gitlab']['gitlab-core']['backlog'] = 1024
  43 +default['gitlab']['gitlab-core']['tcp_nodelay'] = true
  44 +default['gitlab']['gitlab-core']['worker_timeout'] = 3600
  45 +default['gitlab']['gitlab-core']['umask'] = "0022"
  46 +default['gitlab']['gitlab-core']['worker_processes'] = 2
  47 +default['gitlab']['gitlab-core']['session_key'] = "_sandbox_session"
  48 +default['gitlab']['gitlab-core']['cookie_domain'] = "all"
  49 +default['gitlab']['gitlab-core']['cookie_secret'] = "47b3b8d95dea455baf32155e95d1e64e"
  50 +default['gitlab']['gitlab-core']['web_ui_client_name'] = "chef-webui"
  51 +default['gitlab']['gitlab-core']['web_ui_admin_user_name'] = "admin"
  52 +default['gitlab']['gitlab-core']['web_ui_admin_default_password'] = "p@ssw0rd1"
  53 +
54 default['gitlab']['gitlab-core']['repositories_path'] = "/var/opt/gitlab/repositories" 54 default['gitlab']['gitlab-core']['repositories_path'] = "/var/opt/gitlab/repositories"
55 default['gitlab']['gitlab-core']['internal_api_url'] = "http://localhost:8080" 55 default['gitlab']['gitlab-core']['internal_api_url'] = "http://localhost:8080"
56 56