From 4b192c3f694f10bfe14ad5b9c3b4df912b96a531 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 6 Feb 2014 18:12:25 +0100 Subject: [PATCH] Adapt show_config to GitLab --- files/gitlab-cookbooks/gitlab/recipes/show_config.rb | 4 ++-- files/gitlab-cookbooks/show-config.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/gitlab-cookbooks/gitlab/recipes/show_config.rb b/files/gitlab-cookbooks/gitlab/recipes/show_config.rb index a7851a5..1becb7e 100644 --- a/files/gitlab-cookbooks/gitlab/recipes/show_config.rb +++ b/files/gitlab-cookbooks/gitlab/recipes/show_config.rb @@ -15,9 +15,9 @@ # limitations under the License. # -if File.exists?("/etc/chef-server/chef-server.rb") +if File.exists?("/etc/gitlab/gitlab.rb") ChefServer[:node] = node - ChefServer.from_file("/etc/chef-server/chef-server.rb") + ChefServer.from_file("/etc/gitlab/gitlab.rb") end config = ChefServer.generate_config(node['fqdn']) diff --git a/files/gitlab-cookbooks/show-config.json b/files/gitlab-cookbooks/show-config.json index 3ab5a7a..5e5e54d 100644 --- a/files/gitlab-cookbooks/show-config.json +++ b/files/gitlab-cookbooks/show-config.json @@ -1,3 +1,3 @@ { - "run_list": [ "recipe[chef-server::show_config]" ] + "run_list": [ "recipe[gitlab::show_config]" ] } -- libgit2 0.21.2