Download as
Browse Code »

Commit 4696545fa53dde4340d6b6d0ac8af9a1af68db18

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

Also change ChefServer to Gitlab in show_config.rb

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/recipes/show_config.rb
  Diff comments   View file @4696545
@@ -16,10 +16,10 @@ @@ -16,10 +16,10 @@
16 # 16 #
17 17
18 if File.exists?("/etc/gitlab/gitlab.rb") 18 if File.exists?("/etc/gitlab/gitlab.rb")
19 - ChefServer[:node] = node  
20 - ChefServer.from_file("/etc/gitlab/gitlab.rb") 19 + Gitlab[:node] = node
  20 + Gitlab.from_file("/etc/gitlab/gitlab.rb")
21 end 21 end
22 -config = ChefServer.generate_config(node['fqdn']) 22 +config = Gitlab.generate_config(node['fqdn'])
23 23
24 puts Chef::JSONCompat.to_json_pretty(config) 24 puts Chef::JSONCompat.to_json_pretty(config)
25 return 25 return