diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-01-04 16:07:44 -0800 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-01-18 13:32:42 -0800 |
| commit | af887d450329bca13bb250c51b877f13ea292ab9 (patch) | |
| tree | df136a6109cbf5edba9c86533251ef64f3dd678a | |
| parent | 6929be22ac8ed0a367718db2c83166a188a6a62b (diff) | |
| download | chef-af887d450329bca13bb250c51b877f13ea292ab9.tar.gz | |
Updated the chef client to retrieve certs from the Windows registry. Tests included. This is PR3 since I keep trashing them
Signed-off-by: John McCrae <john.mccrae@progress.com>
| -rw-r--r-- | Rakefile | 19 | ||||
| -rw-r--r-- | chef-universal-mingw32.gemspec | 2 |
2 files changed, 1 insertions, 20 deletions
@@ -99,25 +99,6 @@ task :register_eventlog do end end -desc "Copies powershell_exec related binaries from the latest built Habitat Packages" -task :update_chef_exec_dll do - raise "This task must be run on Windows since we are installing a Windows targeted package!" unless Gem.win_platform? - - require "mkmf" - raise "Unable to locate Habitat cli. Please install Habitat cli before invoking this task!" unless find_executable "hab" - - sh("hab pkg install chef/chef-powershell-shim") - sh("hab pkg install chef/chef-powershell-shim-x86") - x64 = `hab pkg path chef/chef-powershell-shim`.chomp.tr("\\", "/") - x86 = `hab pkg path chef/chef-powershell-shim-x86`.chomp.tr("\\", "/") - FileUtils.rm_rf(Dir["distro/ruby_bin_folder/AMD64/*"]) - FileUtils.rm_rf(Dir["distro/ruby_bin_folder/x86/*"]) - puts "Copying #{x64}/bin/* to distro/ruby_bin_folder/AMD64" - FileUtils.cp_r(Dir["#{x64}/bin/*"], "distro/ruby_bin_folder/AMD64") - puts "Copying #{x86}/bin/* to distro/ruby_bin_folder/x86" - FileUtils.cp_r(Dir["#{x86}/bin/*"], "distro/ruby_bin_folder/x86") -end - begin require "chefstyle" require "rubocop/rake_task" diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec index 314b40effb..60b69e881d 100644 --- a/chef-universal-mingw32.gemspec +++ b/chef-universal-mingw32.gemspec @@ -15,7 +15,7 @@ gemspec.add_dependency "wmi-lite", "~> 1.0" gemspec.add_dependency "win32-taskscheduler", "~> 2.0" gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out gemspec.add_dependency "win32-certstore", "~> 0.6.2" # 0.5+ required for specifying user vs. system store -gemspec.add_dependency "chef-powershell", "~> 1.0.6" +gemspec.add_dependency "chef-powershell", "~> 1.0.6" # The guts of the powershell_exec code have been moved to its own gem, chef-powershell. It's part of the chef-powershell-shim repo. gemspec.extensions << "ext/win32-eventlog/Rakefile" gemspec.files += Dir.glob("{distro,ext}/**/*") |