Download as
Browse Code »

Commit 06a8d950c063515bacf5460fc5b00bde219369f1

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

No need to use a template

Showing 2 changed files with 2 additions and 4 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
  Diff comments   View file @06a8d95
@@ -39,12 +39,11 @@ should_notify = OmnibusHelper.should_notify?("gitlab-core") @@ -39,12 +39,11 @@ should_notify = OmnibusHelper.should_notify?("gitlab-core")
39 39
40 secret_token_config = File.join(gitlab_core_etc_dir, "secret") 40 secret_token_config = File.join(gitlab_core_etc_dir, "secret")
41 41
42 -template secret_token_config do  
43 - source "secret_token" 42 +file secret_token_config do
  43 + content node['gitlab']['gitlab-core']['secret_token']
44 owner "root" 44 owner "root"
45 group "root" 45 group "root"
46 mode "0644" 46 mode "0644"
47 - variables(node['gitlab']['gitlab-core'].to_hash)  
48 notifies :restart, 'service[gitlab-core]' if should_notify 47 notifies :restart, 'service[gitlab-core]' if should_notify
49 end 48 end
50 49
files/gitlab-cookbooks/gitlab/templates/default/secret_token.erb
View file @6d6f13e
@@ -1 +0,0 @@ @@ -1 +0,0 @@
1 -<%= @secret_token %>