From 36a95d824337c63229c52cf53feb2a6e7260081b Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 3 Feb 2014 17:18:13 +0100 Subject: [PATCH] Remove erchef-related bootstrap code --- files/gitlab-cookbooks/gitlab/recipes/bootstrap.rb | 28 ---------------------------- 1 file changed, 0 insertions(+), 28 deletions(-) diff --git a/files/gitlab-cookbooks/gitlab/recipes/bootstrap.rb b/files/gitlab-cookbooks/gitlab/recipes/bootstrap.rb index e982369..61c7741 100644 --- a/files/gitlab-cookbooks/gitlab/recipes/bootstrap.rb +++ b/files/gitlab-cookbooks/gitlab/recipes/bootstrap.rb @@ -16,34 +16,6 @@ # bootstrap_status_file = "/var/opt/chef-server/bootstrapped" -erchef_dir = "/opt/chef-server/embedded/service/erchef" - -erchef_status_url = "http://#{node['chef_server']['erchef']['listen']}" -erchef_status_url << ":#{node['chef_server']['erchef']['port']}/_status" - -execute "verify-system-status" do - command "curl -sf #{erchef_status_url}" - retries 20 - not_if { File.exists?(bootstrap_status_file) } -end - -execute "boostrap-chef-server" do - command "bin/bootstrap-chef-server" - cwd erchef_dir - not_if { File.exists?(bootstrap_status_file) } - environment({ 'CHEF_ADMIN_USER' => node['chef_server']['chef-server-webui']['web_ui_admin_user_name'], - 'CHEF_ADMIN_PASS' => node['chef_server']['chef-server-webui']['web_ui_admin_default_password'] }) - notifies :restart, 'service[erchef]' -end - -# servers need access to this key. -chef_user = node['chef_server']['user']['username'] -file "/etc/chef-server/chef-webui.pem" do - owner "root" - group chef_user - mode "0640" - not_if { File.exists?(bootstrap_status_file) } -end file bootstrap_status_file do owner "root" -- libgit2 0.21.2