Download as
Browse Code »

Commit 6d6f13ef37fb715fa0171ddbe1d44d22c06cab24

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

Set/store the secret_token in gitlab_secrets.json 

We generate 64 characters because that is what we also do in
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/secret_token.rb
Showing 2 changed files with 5 additions and 0 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/libraries/gitlab.rb
  Diff comments   View file @6d6f13e
@@ -48,6 +48,7 @@ module Gitlab @@ -48,6 +48,7 @@ module Gitlab
48 end 48 end
49 49
50 Gitlab['postgresql']['sql_password'] ||= generate_hex(50) 50 Gitlab['postgresql']['sql_password'] ||= generate_hex(50)
  51 + Gitlab['gitlab-core']['secret_token'] ||= generate_hex(64)
51 52
52 if File.directory?("/etc/gitlab") 53 if File.directory?("/etc/gitlab")
53 File.open("/etc/gitlab/gitlab-secrets.json", "w") do |f| 54 File.open("/etc/gitlab/gitlab-secrets.json", "w") do |f|
@@ -56,6 +57,9 @@ module Gitlab @@ -56,6 +57,9 @@ module Gitlab
56 'postgresql' => { 57 'postgresql' => {
57 'sql_password' => Gitlab['postgresql']['sql_password'], 58 'sql_password' => Gitlab['postgresql']['sql_password'],
58 }, 59 },
  60 + 'gitlab-core' => {
  61 + 'secret_token' => Gitlab['gitlab-core']['secret_token'],
  62 + }
59 }) 63 })
60 ) 64 )
61 system("chmod 0600 /etc/gitlab/gitlab-secrets.json") 65 system("chmod 0600 /etc/gitlab/gitlab-secrets.json")
files/gitlab-cookbooks/gitlab/templates/default/secret_token.erb 0 → 100644
  Diff comments   View file @6d6f13e
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +<%= @secret_token %>