From a51de0796cb14f66c215d0a3e56ec1aff06fbfa8 Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Thu, 21 Nov 2013 10:55:07 -0800 Subject: [PATCH] [OC-10648] Fix check for disabled services in 008-fix-logging migration The component_runit_service resources enables and disables services by creating or deleting links in the /opt/opscode/service directory. The migration script erroneously checks /opt/opscode/sv instead. The errant check causes an error when upgrading from 1.4.6 to 11.0.1 because of commit 9de057f50ce33acaf7fef142b4239a5bb3595ceb which disables opscode-certificate on frontend machines. --- files/private-chef-upgrades/001/008_fix_logging.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/private-chef-upgrades/001/008_fix_logging.rb b/files/private-chef-upgrades/001/008_fix_logging.rb index f53ab43e7..ba664d1f9 100644 --- a/files/private-chef-upgrades/001/008_fix_logging.rb +++ b/files/private-chef-upgrades/001/008_fix_logging.rb @@ -37,8 +37,8 @@ run_command("chown opscode:opscode /var/log/opscode/#{service}/*") # There could be leftover logs for a service we don't use anymore... - # (e.g. authz). So check the service is defined before restartint it. - if File.exist?("/opt/opscode/sv/#{service}") + # (e.g. authz). So check the service is defined before restarting it. + if File.exist?("/opt/opscode/service/#{service}") # force svlogd process to reload run_command("/opt/opscode/embedded/bin/sv force-restart /opt/opscode/sv/#{service}/log") end