Download as
Browse Code »

Commit 4b192c3f694f10bfe14ad5b9c3b4df912b96a531

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

Adapt show_config to GitLab

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/recipes/show_config.rb
  Diff comments   View file @4b192c3
@@ -15,9 +15,9 @@ @@ -15,9 +15,9 @@
15 # limitations under the License. 15 # limitations under the License.
16 # 16 #
17 17
18 -if File.exists?("/etc/chef-server/chef-server.rb") 18 +if File.exists?("/etc/gitlab/gitlab.rb")
19 ChefServer[:node] = node 19 ChefServer[:node] = node
20 - ChefServer.from_file("/etc/chef-server/chef-server.rb") 20 + ChefServer.from_file("/etc/gitlab/gitlab.rb")
21 end 21 end
22 config = ChefServer.generate_config(node['fqdn']) 22 config = ChefServer.generate_config(node['fqdn'])
23 23
files/gitlab-cookbooks/show-config.json
  Diff comments   View file @4b192c3
1 { 1 {
2 - "run_list": [ "recipe[chef-server::show_config]" ] 2 + "run_list": [ "recipe[gitlab::show_config]" ]
3 } 3 }