Download as
Browse Code »

Commit c6b8c42161deed81eefee77c6b93375a7e52efb4

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

Improve whitespace and readability of attributes

Showing 1 changed file with 12 additions and 2 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @c6b8c42
@@ -15,8 +15,12 @@ @@ -15,8 +15,12 @@
15 # limitations under the License. 15 # limitations under the License.
16 # 16 #
17 17
  18 +####
  19 +# omnibus options
  20 +####
18 default['gitlab']['bootstrap']['enable'] = true 21 default['gitlab']['bootstrap']['enable'] = true
19 22
  23 +
20 #### 24 ####
21 # The Git User that services run as 25 # The Git User that services run as
22 #### 26 ####
@@ -28,6 +32,7 @@ default['gitlab']['user']['shell'] = "/bin/sh" @@ -28,6 +32,7 @@ default['gitlab']['user']['shell'] = "/bin/sh"
28 # The home directory for the chef services user 32 # The home directory for the chef services user
29 default['gitlab']['user']['home'] = "/var/opt/gitlab" 33 default['gitlab']['user']['home'] = "/var/opt/gitlab"
30 34
  35 +
31 #### 36 ####
32 # GitLab core 37 # GitLab core
33 #### 38 ####
@@ -53,6 +58,10 @@ default['gitlab']['gitlab-core']['web_ui_admin_default_password'] = "p@ssw0rd1" @@ -53,6 +58,10 @@ default['gitlab']['gitlab-core']['web_ui_admin_default_password'] = "p@ssw0rd1"
53 default['gitlab']['gitlab-core']['repositories_path'] = "/var/opt/gitlab/repositories" 58 default['gitlab']['gitlab-core']['repositories_path'] = "/var/opt/gitlab/repositories"
54 default['gitlab']['gitlab-core']['internal_api_url'] = "http://localhost:8080" 59 default['gitlab']['gitlab-core']['internal_api_url'] = "http://localhost:8080"
55 60
  61 +
  62 +###
  63 +# gitlab-shell
  64 +###
56 default['gitlab']['gitlab-shell']['log_directory'] = "/var/log/gitlab/gitlab-shell/" 65 default['gitlab']['gitlab-shell']['log_directory'] = "/var/log/gitlab/gitlab-shell/"
57 66
58 67
@@ -96,9 +105,10 @@ default['gitlab']['postgresql']['checkpoint_timeout'] = "5min" @@ -96,9 +105,10 @@ default['gitlab']['postgresql']['checkpoint_timeout'] = "5min"
96 default['gitlab']['postgresql']['checkpoint_completion_target'] = 0.9 105 default['gitlab']['postgresql']['checkpoint_completion_target'] = 0.9
97 default['gitlab']['postgresql']['checkpoint_warning'] = "30s" 106 default['gitlab']['postgresql']['checkpoint_warning'] = "30s"
98 107
99 -### 108 +
  109 +####
100 # Redis 110 # Redis
101 -### 111 +####
102 default['gitlab']['redis']['enable'] = true 112 default['gitlab']['redis']['enable'] = true
103 default['gitlab']['redis']['ha'] = false 113 default['gitlab']['redis']['ha'] = false
104 default['gitlab']['redis']['dir'] = "/var/opt/gitlab/redis" 114 default['gitlab']['redis']['dir'] = "/var/opt/gitlab/redis"