Download as
Browse Code »

Commit b45505035ca0b4a5e5fd6be2607a6727ed25f2df

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

Fix gitlab-core option parsing in module Gitlab

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/libraries/gitlab.rb
  Diff comments   View file @b455050
@@ -27,6 +27,7 @@ module Gitlab @@ -27,6 +27,7 @@ module Gitlab
27 bootstrap Mash.new 27 bootstrap Mash.new
28 postgresql Mash.new 28 postgresql Mash.new
29 redis Mash.new 29 redis Mash.new
  30 + gitlab_core Mash.new
30 node nil 31 node nil
31 32
32 class << self 33 class << self
@@ -48,7 +49,7 @@ module Gitlab @@ -48,7 +49,7 @@ module Gitlab
48 end 49 end
49 50
50 Gitlab['postgresql']['sql_password'] ||= generate_hex(50) 51 Gitlab['postgresql']['sql_password'] ||= generate_hex(50)
51 - Gitlab['gitlab-core']['secret_token'] ||= generate_hex(64) 52 + Gitlab['gitlab_core']['secret_token'] ||= generate_hex(64)
52 53
53 if File.directory?("/etc/gitlab") 54 if File.directory?("/etc/gitlab")
54 File.open("/etc/gitlab/gitlab-secrets.json", "w") do |f| 55 File.open("/etc/gitlab/gitlab-secrets.json", "w") do |f|
@@ -57,8 +58,8 @@ module Gitlab @@ -57,8 +58,8 @@ module Gitlab
57 'postgresql' => { 58 'postgresql' => {
58 'sql_password' => Gitlab['postgresql']['sql_password'], 59 'sql_password' => Gitlab['postgresql']['sql_password'],
59 }, 60 },
60 - 'gitlab-core' => {  
61 - 'secret_token' => Gitlab['gitlab-core']['secret_token'], 61 + 'gitlab_core' => {
  62 + 'secret_token' => Gitlab['gitlab_core']['secret_token'],
62 } 63 }
63 }) 64 })
64 ) 65 )