chef 17.10.95 → 18.0.169

Sign up to get free protection for your applications and to get access to all the features.
Files changed (313) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +16 -8
  3. data/README.md +7 -7
  4. data/Rakefile +3 -22
  5. data/{chef-universal-mingw32.gemspec → chef-universal-mingw-ucrt.gemspec} +8 -7
  6. data/chef.gemspec +14 -7
  7. data/lib/chef/api_client_v1.rb +9 -1
  8. data/lib/chef/application/exit_code.rb +3 -3
  9. data/lib/chef/client.rb +169 -17
  10. data/lib/chef/compliance/input.rb +1 -1
  11. data/lib/chef/compliance/profile.rb +1 -1
  12. data/lib/chef/compliance/profile_collection.rb +0 -1
  13. data/lib/chef/compliance/waiver.rb +1 -1
  14. data/lib/chef/cookbook/syntax_check.rb +2 -2
  15. data/lib/chef/dsl/reader_helpers.rb +1 -1
  16. data/lib/chef/dsl/rest_resource.rb +77 -0
  17. data/lib/chef/event_dispatch/base.rb +3 -0
  18. data/lib/chef/exceptions.rb +8 -0
  19. data/lib/chef/http/authenticator.rb +170 -3
  20. data/lib/chef/http/ssl_policies.rb +3 -3
  21. data/lib/chef/mixin/checksum.rb +0 -6
  22. data/lib/chef/mixin/powershell_exec.rb +5 -28
  23. data/lib/chef/node/mixin/immutablize_array.rb +1 -0
  24. data/lib/chef/property.rb +5 -3
  25. data/lib/chef/provider/file.rb +2 -2
  26. data/lib/chef/provider/group/windows.rb +1 -1
  27. data/lib/chef/provider/http_request.rb +11 -9
  28. data/lib/chef/provider/mount/linux.rb +5 -0
  29. data/lib/chef/provider/mount/mount.rb +8 -0
  30. data/lib/chef/provider/mount/windows.rb +1 -1
  31. data/lib/chef/provider/package/chocolatey.rb +1 -18
  32. data/lib/chef/provider/package/rubygems.rb +1 -1
  33. data/lib/chef/provider/package/windows/msi.rb +2 -2
  34. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +1 -1
  35. data/lib/chef/provider/package/windows.rb +1 -1
  36. data/lib/chef/provider/package/zypper/version.rb +60 -0
  37. data/lib/chef/provider/package/zypper.rb +47 -3
  38. data/lib/chef/provider/service/windows.rb +1 -1
  39. data/lib/chef/provider/user/aix.rb +5 -0
  40. data/lib/chef/provider/user/linux.rb +29 -0
  41. data/lib/chef/provider/user/mac.rb +1 -1
  42. data/lib/chef/provider/user.rb +46 -14
  43. data/lib/chef/provider.rb +1 -1
  44. data/lib/chef/recipe.rb +1 -1
  45. data/lib/chef/resource/_rest_resource.rb +389 -0
  46. data/lib/chef/resource/alternatives.rb +0 -1
  47. data/lib/chef/resource/apt_package.rb +0 -1
  48. data/lib/chef/resource/apt_preference.rb +0 -1
  49. data/lib/chef/resource/apt_repository.rb +0 -1
  50. data/lib/chef/resource/apt_update.rb +0 -1
  51. data/lib/chef/resource/archive_file.rb +0 -1
  52. data/lib/chef/resource/bash.rb +0 -1
  53. data/lib/chef/resource/batch.rb +0 -1
  54. data/lib/chef/resource/bff_package.rb +0 -1
  55. data/lib/chef/resource/breakpoint.rb +0 -1
  56. data/lib/chef/resource/build_essential.rb +0 -1
  57. data/lib/chef/resource/cab_package.rb +0 -1
  58. data/lib/chef/resource/chef_client_config.rb +12 -14
  59. data/lib/chef/resource/chef_client_cron.rb +1 -2
  60. data/lib/chef/resource/chef_client_launchd.rb +2 -2
  61. data/lib/chef/resource/chef_client_scheduled_task.rb +3 -3
  62. data/lib/chef/resource/chef_client_systemd_timer.rb +0 -1
  63. data/lib/chef/resource/chef_client_trusted_certificate.rb +0 -1
  64. data/lib/chef/resource/chef_gem.rb +0 -1
  65. data/lib/chef/resource/chef_handler.rb +0 -1
  66. data/lib/chef/resource/chef_sleep.rb +1 -3
  67. data/lib/chef/resource/chef_vault_secret.rb +0 -1
  68. data/lib/chef/resource/chocolatey_config.rb +0 -1
  69. data/lib/chef/resource/chocolatey_feature.rb +0 -1
  70. data/lib/chef/resource/chocolatey_package.rb +0 -1
  71. data/lib/chef/resource/chocolatey_source.rb +0 -1
  72. data/lib/chef/resource/cookbook_file.rb +0 -1
  73. data/lib/chef/resource/cron/_cron_shared.rb +0 -1
  74. data/lib/chef/resource/cron/cron.rb +0 -1
  75. data/lib/chef/resource/cron/cron_d.rb +15 -1
  76. data/lib/chef/resource/cron_access.rb +0 -1
  77. data/lib/chef/resource/csh.rb +0 -1
  78. data/lib/chef/resource/directory.rb +0 -1
  79. data/lib/chef/resource/dmg_package.rb +0 -1
  80. data/lib/chef/resource/dnf_package.rb +0 -1
  81. data/lib/chef/resource/dpkg_package.rb +0 -1
  82. data/lib/chef/resource/dsc_resource.rb +0 -1
  83. data/lib/chef/resource/dsc_script.rb +0 -1
  84. data/lib/chef/resource/execute.rb +0 -1
  85. data/lib/chef/resource/file.rb +0 -1
  86. data/lib/chef/resource/freebsd_package.rb +0 -1
  87. data/lib/chef/resource/gem_package.rb +0 -1
  88. data/lib/chef/resource/group.rb +25 -2
  89. data/lib/chef/resource/habitat/habitat_package.rb +0 -1
  90. data/lib/chef/resource/habitat/habitat_sup.rb +6 -7
  91. data/lib/chef/resource/habitat/habitat_sup_windows.rb +1 -1
  92. data/lib/chef/resource/habitat_config.rb +0 -1
  93. data/lib/chef/resource/habitat_install.rb +0 -1
  94. data/lib/chef/resource/habitat_service.rb +0 -1
  95. data/lib/chef/resource/habitat_user_toml.rb +0 -1
  96. data/lib/chef/resource/homebrew_cask.rb +0 -1
  97. data/lib/chef/resource/homebrew_package.rb +0 -1
  98. data/lib/chef/resource/homebrew_tap.rb +0 -1
  99. data/lib/chef/resource/homebrew_update.rb +0 -2
  100. data/lib/chef/resource/hostname.rb +0 -1
  101. data/lib/chef/resource/http_request.rb +0 -1
  102. data/lib/chef/resource/ifconfig.rb +0 -1
  103. data/lib/chef/resource/inspec_input.rb +0 -1
  104. data/lib/chef/resource/inspec_waiver.rb +0 -1
  105. data/lib/chef/resource/inspec_waiver_file_entry.rb +2 -3
  106. data/lib/chef/resource/ips_package.rb +0 -1
  107. data/lib/chef/resource/kernel_module.rb +0 -1
  108. data/lib/chef/resource/ksh.rb +0 -1
  109. data/lib/chef/resource/launchd.rb +0 -1
  110. data/lib/chef/resource/link.rb +0 -1
  111. data/lib/chef/resource/locale.rb +2 -6
  112. data/lib/chef/resource/log.rb +0 -1
  113. data/lib/chef/resource/lwrp_base.rb +0 -4
  114. data/lib/chef/resource/macos_userdefaults.rb +5 -10
  115. data/lib/chef/resource/macosx_service.rb +0 -1
  116. data/lib/chef/resource/macports_package.rb +0 -1
  117. data/lib/chef/resource/mdadm.rb +0 -1
  118. data/lib/chef/resource/mount.rb +0 -1
  119. data/lib/chef/resource/msu_package.rb +0 -1
  120. data/lib/chef/resource/notify_group.rb +0 -2
  121. data/lib/chef/resource/ohai.rb +0 -1
  122. data/lib/chef/resource/ohai_hint.rb +0 -1
  123. data/lib/chef/resource/openbsd_package.rb +0 -1
  124. data/lib/chef/resource/openssl_dhparam.rb +0 -2
  125. data/lib/chef/resource/openssl_ec_private_key.rb +0 -2
  126. data/lib/chef/resource/openssl_ec_public_key.rb +0 -2
  127. data/lib/chef/resource/openssl_rsa_private_key.rb +0 -2
  128. data/lib/chef/resource/openssl_rsa_public_key.rb +0 -2
  129. data/lib/chef/resource/openssl_x509_certificate.rb +0 -2
  130. data/lib/chef/resource/openssl_x509_crl.rb +0 -2
  131. data/lib/chef/resource/openssl_x509_request.rb +0 -2
  132. data/lib/chef/resource/osx_profile.rb +0 -1
  133. data/lib/chef/resource/package.rb +0 -1
  134. data/lib/chef/resource/pacman_package.rb +0 -1
  135. data/lib/chef/resource/paludis_package.rb +0 -1
  136. data/lib/chef/resource/perl.rb +0 -1
  137. data/lib/chef/resource/plist.rb +7 -3
  138. data/lib/chef/resource/portage_package.rb +0 -1
  139. data/lib/chef/resource/powershell_package.rb +0 -1
  140. data/lib/chef/resource/powershell_package_source.rb +0 -1
  141. data/lib/chef/resource/powershell_script.rb +0 -1
  142. data/lib/chef/resource/python.rb +0 -1
  143. data/lib/chef/resource/reboot.rb +0 -1
  144. data/lib/chef/resource/registry_key.rb +0 -1
  145. data/lib/chef/resource/remote_directory.rb +0 -1
  146. data/lib/chef/resource/remote_file.rb +0 -1
  147. data/lib/chef/resource/rhsm_errata.rb +0 -1
  148. data/lib/chef/resource/rhsm_errata_level.rb +0 -1
  149. data/lib/chef/resource/rhsm_register.rb +0 -3
  150. data/lib/chef/resource/rhsm_repo.rb +0 -1
  151. data/lib/chef/resource/rhsm_subscription.rb +0 -1
  152. data/lib/chef/resource/route.rb +0 -1
  153. data/lib/chef/resource/rpm_package.rb +0 -1
  154. data/lib/chef/resource/ruby.rb +0 -1
  155. data/lib/chef/resource/ruby_block.rb +0 -1
  156. data/lib/chef/resource/scm/_scm.rb +0 -2
  157. data/lib/chef/resource/scm/git.rb +0 -2
  158. data/lib/chef/resource/scm/subversion.rb +0 -2
  159. data/lib/chef/resource/script.rb +0 -1
  160. data/lib/chef/resource/selinux/common_helpers.rb +47 -0
  161. data/lib/chef/resource/selinux/selinux_debian.erb +18 -0
  162. data/lib/chef/resource/selinux/selinux_default.erb +15 -0
  163. data/lib/chef/resource/selinux_boolean.rb +101 -0
  164. data/lib/chef/resource/selinux_fcontext.rb +160 -0
  165. data/lib/chef/resource/selinux_install.rb +107 -0
  166. data/lib/chef/resource/selinux_module.rb +143 -0
  167. data/lib/chef/resource/selinux_permissive.rb +64 -0
  168. data/lib/chef/resource/selinux_port.rb +118 -0
  169. data/lib/chef/resource/selinux_state.rb +166 -0
  170. data/lib/chef/resource/service.rb +0 -1
  171. data/lib/chef/resource/smartos_package.rb +0 -1
  172. data/lib/chef/resource/snap_package.rb +0 -1
  173. data/lib/chef/resource/solaris_package.rb +0 -1
  174. data/lib/chef/resource/ssh_known_hosts_entry.rb +0 -1
  175. data/lib/chef/resource/sudo.rb +0 -1
  176. data/lib/chef/resource/support/client.erb +2 -2
  177. data/lib/chef/resource/swap_file.rb +0 -1
  178. data/lib/chef/resource/sysctl.rb +1 -2
  179. data/lib/chef/resource/systemd_unit.rb +0 -1
  180. data/lib/chef/resource/template.rb +0 -1
  181. data/lib/chef/resource/timezone.rb +0 -1
  182. data/lib/chef/resource/user/aix_user.rb +0 -1
  183. data/lib/chef/resource/user/linux_user.rb +0 -1
  184. data/lib/chef/resource/user/mac_user.rb +0 -1
  185. data/lib/chef/resource/user/pw_user.rb +0 -1
  186. data/lib/chef/resource/user/solaris_user.rb +0 -1
  187. data/lib/chef/resource/user/windows_user.rb +0 -1
  188. data/lib/chef/resource/user.rb +10 -1
  189. data/lib/chef/resource/user_ulimit.rb +0 -1
  190. data/lib/chef/resource/whyrun_safe_ruby_block.rb +0 -1
  191. data/lib/chef/resource/windows_ad_join.rb +0 -2
  192. data/lib/chef/resource/windows_audit_policy.rb +0 -2
  193. data/lib/chef/resource/windows_auto_run.rb +0 -1
  194. data/lib/chef/resource/windows_defender.rb +0 -1
  195. data/lib/chef/resource/windows_defender_exclusion.rb +0 -1
  196. data/lib/chef/resource/windows_dfs_folder.rb +0 -1
  197. data/lib/chef/resource/windows_dfs_namespace.rb +0 -1
  198. data/lib/chef/resource/windows_dfs_server.rb +0 -1
  199. data/lib/chef/resource/windows_dns_record.rb +0 -1
  200. data/lib/chef/resource/windows_dns_zone.rb +0 -1
  201. data/lib/chef/resource/windows_env.rb +0 -1
  202. data/lib/chef/resource/windows_feature.rb +0 -1
  203. data/lib/chef/resource/windows_feature_dism.rb +0 -1
  204. data/lib/chef/resource/windows_feature_powershell.rb +0 -1
  205. data/lib/chef/resource/windows_firewall_profile.rb +0 -2
  206. data/lib/chef/resource/windows_firewall_rule.rb +0 -1
  207. data/lib/chef/resource/windows_font.rb +2 -3
  208. data/lib/chef/resource/windows_package.rb +0 -1
  209. data/lib/chef/resource/windows_pagefile.rb +0 -2
  210. data/lib/chef/resource/windows_path.rb +0 -1
  211. data/lib/chef/resource/windows_printer.rb +0 -1
  212. data/lib/chef/resource/windows_printer_port.rb +0 -1
  213. data/lib/chef/resource/windows_script.rb +0 -2
  214. data/lib/chef/resource/windows_security_policy.rb +0 -1
  215. data/lib/chef/resource/windows_service.rb +0 -1
  216. data/lib/chef/resource/windows_share.rb +0 -1
  217. data/lib/chef/resource/windows_shortcut.rb +1 -2
  218. data/lib/chef/resource/windows_task.rb +0 -1
  219. data/lib/chef/resource/windows_uac.rb +0 -1
  220. data/lib/chef/resource/windows_update_settings.rb +0 -1
  221. data/lib/chef/resource/windows_user_privilege.rb +0 -1
  222. data/lib/chef/resource/windows_workgroup.rb +0 -1
  223. data/lib/chef/resource/yum_package.rb +0 -1
  224. data/lib/chef/resource/yum_repository.rb +0 -1
  225. data/lib/chef/resource/zypper_package.rb +0 -1
  226. data/lib/chef/resource/zypper_repository.rb +0 -1
  227. data/lib/chef/resource.rb +12 -5
  228. data/lib/chef/resources.rb +7 -0
  229. data/lib/chef/run_context.rb +3 -3
  230. data/lib/chef/secret_fetcher/azure_key_vault.rb +3 -3
  231. data/lib/chef/version.rb +1 -1
  232. data/lib/chef/win32/handle.rb +6 -7
  233. data/lib/chef/win32/registry.rb +7 -3
  234. data/spec/data/rubygems.org/sexp_processor-info +2 -1
  235. data/spec/data/trusted_certs/example.crt +20 -29
  236. data/spec/data/trusted_certs/example_no_cn.crt +34 -30
  237. data/spec/data/trusted_certs/opscode.pem +54 -33
  238. data/spec/functional/resource/chocolatey_package_spec.rb +20 -32
  239. data/spec/functional/resource/dsc_script_spec.rb +1 -1
  240. data/spec/functional/resource/group_spec.rb +10 -6
  241. data/spec/functional/resource/link_spec.rb +8 -8
  242. data/spec/functional/resource/macos_userdefaults_spec.rb +4 -4
  243. data/spec/functional/resource/plist_spec.rb +25 -0
  244. data/spec/functional/resource/user/linux_user_spec.rb +127 -0
  245. data/spec/functional/resource/windows_certificate_spec.rb +1 -26
  246. data/spec/functional/resource/windows_font_spec.rb +12 -9
  247. data/spec/functional/resource/yum_package_spec.rb +1 -1
  248. data/spec/functional/resource/zypper_package_spec.rb +12 -0
  249. data/spec/functional/shell_spec.rb +1 -2
  250. data/spec/functional/version_spec.rb +1 -1
  251. data/spec/integration/client/client_spec.rb +82 -3
  252. data/spec/integration/client/exit_code_spec.rb +1 -1
  253. data/spec/integration/client/ipv6_spec.rb +1 -1
  254. data/spec/integration/compliance/compliance_spec.rb +1 -1
  255. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  256. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +1 -1
  257. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  258. data/spec/integration/recipes/notifies_spec.rb +1 -1
  259. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  260. data/spec/integration/recipes/remote_directory.rb +1 -1
  261. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  262. data/spec/integration/recipes/use_partial_spec.rb +2 -1
  263. data/spec/integration/solo/solo_spec.rb +2 -2
  264. data/spec/spec_helper.rb +1 -0
  265. data/spec/support/platform_helpers.rb +4 -0
  266. data/spec/support/ruby_installer.rb +1 -1
  267. data/spec/support/shared/functional/windows_script.rb +2 -2
  268. data/spec/unit/application/client_spec.rb +0 -10
  269. data/spec/unit/client_spec.rb +57 -8
  270. data/spec/unit/compliance/reporter/chef_server_automate_spec.rb +1 -1
  271. data/spec/unit/cookbook/syntax_check_spec.rb +3 -0
  272. data/spec/unit/http/authenticator_spec.rb +68 -0
  273. data/spec/unit/mixin/checksum_spec.rb +0 -28
  274. data/spec/unit/mixin/powershell_exec_spec.rb +5 -5
  275. data/spec/unit/platform/query_helpers_spec.rb +2 -17
  276. data/spec/unit/provider/http_request_spec.rb +60 -72
  277. data/spec/unit/provider/mount/linux_spec.rb +10 -0
  278. data/spec/unit/provider/package/chocolatey_spec.rb +3 -19
  279. data/spec/unit/provider/package/rubygems_spec.rb +1 -1
  280. data/spec/unit/provider/package/zypper_spec.rb +32 -0
  281. data/spec/unit/provider/user/linux_spec.rb +51 -11
  282. data/spec/unit/provider/user_spec.rb +24 -6
  283. data/spec/unit/resource/archive_file_spec.rb +1 -1
  284. data/spec/unit/resource/chef_client_cron_spec.rb +5 -0
  285. data/spec/unit/resource/chef_client_launchd_spec.rb +5 -0
  286. data/spec/unit/resource/chef_client_scheduled_task_spec.rb +5 -0
  287. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +1 -1
  288. data/spec/unit/resource/cron_d_spec.rb +37 -1
  289. data/spec/unit/resource/macos_user_defaults_spec.rb +4 -4
  290. data/spec/unit/resource/rest_resource_spec.rb +381 -0
  291. data/spec/unit/resource/selinux_boolean_spec.rb +92 -0
  292. data/spec/unit/resource/selinux_fcontext_spec.rb +65 -0
  293. data/spec/unit/resource/selinux_install_spec.rb +60 -0
  294. data/spec/unit/resource/selinux_module_spec.rb +55 -0
  295. data/spec/unit/resource/selinux_permissive_spec.rb +39 -0
  296. data/spec/unit/resource/selinux_port_spec.rb +42 -0
  297. data/spec/unit/resource/selinux_state_spec.rb +46 -0
  298. data/spec/unit/resource/sysctl_spec.rb +2 -2
  299. data/spec/unit/resource/user/linux_user_spec.rb +42 -0
  300. data/spec/unit/resource_spec.rb +0 -1
  301. data/spec/unit/util/dsc/local_configuration_manager_spec.rb +1 -1
  302. data/tasks/rspec.rb +1 -1
  303. metadata +102 -30
  304. /data/spec/functional/assets/chocolatey_feed/{test-A.1.0.0.nupkg → test-A.1.0.nupkg} +0 -0
  305. /data/spec/functional/assets/chocolatey_feed/{test-A.1.5.0.nupkg → test-A.1.5.nupkg} +0 -0
  306. /data/spec/functional/assets/chocolatey_feed/{test-A.2.0.0.nupkg → test-A.2.0.nupkg} +0 -0
  307. /data/spec/functional/assets/chocolatey_feed/{test-B.1.0.0.nupkg → test-B.1.0.nupkg} +0 -0
  308. /data/spec/functional/assets/yumrepo/repodata/{01a3b-filelists.sqlite.bz2 → 4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2} +0 -0
  309. /data/spec/functional/assets/yumrepo/repodata/{6bf96-other.xml.gz → 74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz} +0 -0
  310. /data/spec/functional/assets/yumrepo/repodata/{5dc1e-primary.sqlite.bz2 → a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2} +0 -0
  311. /data/spec/functional/assets/yumrepo/repodata/{7c365-other.sqlite.bz2 → af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2} +0 -0
  312. /data/spec/functional/assets/yumrepo/repodata/{401dc-filelists.xml.gz → bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz} +0 -0
  313. /data/spec/functional/assets/yumrepo/repodata/{dabe2-primary.xml.gz → c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz} +0 -0
@@ -24,7 +24,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
24
24
  class Chef
25
25
  class Resource
26
26
  class WindowsEnv < Chef::Resource
27
- unified_mode true
28
27
 
29
28
  provides :windows_env
30
29
  provides :env # backwards compat with the pre-Chef 14 resource name
@@ -21,7 +21,6 @@ require_relative "../resource"
21
21
  class Chef
22
22
  class Resource
23
23
  class WindowsFeature < Chef::Resource
24
- unified_mode true
25
24
 
26
25
  provides(:windows_feature) { true }
27
26
 
@@ -22,7 +22,6 @@ require_relative "../platform/query_helpers"
22
22
  class Chef
23
23
  class Resource
24
24
  class WindowsFeatureDism < Chef::Resource
25
- unified_mode true
26
25
 
27
26
  provides(:windows_feature_dism) { true }
28
27
 
@@ -23,7 +23,6 @@ require_relative "../platform/query_helpers"
23
23
  class Chef
24
24
  class Resource
25
25
  class WindowsFeaturePowershell < Chef::Resource
26
- unified_mode true
27
26
 
28
27
  provides(:windows_feature_powershell) { true }
29
28
 
@@ -58,8 +58,6 @@ class Chef
58
58
  ```
59
59
  DOC
60
60
 
61
- unified_mode true
62
-
63
61
  property :profile, String,
64
62
  name_property: true,
65
63
  equal_to: %w{ Domain Public Private },
@@ -22,7 +22,6 @@
22
22
  class Chef
23
23
  class Resource
24
24
  class WindowsFirewallRule < Chef::Resource
25
- unified_mode true
26
25
 
27
26
  provides :windows_firewall_rule
28
27
 
@@ -21,7 +21,6 @@ class Chef
21
21
  class Resource
22
22
  class WindowsFont < Chef::Resource
23
23
  require_relative "../util/path_helper"
24
- unified_mode true
25
24
 
26
25
  provides(:windows_font) { true }
27
26
 
@@ -83,7 +82,7 @@ class Chef
83
82
 
84
83
  # install the font into the appropriate fonts directory
85
84
  def install_font
86
- require "win32ole" if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
85
+ require "win32ole" if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
87
86
  fonts_dir = Chef::Util::PathHelper.join(ENV["windir"], "fonts")
88
87
  folder = WIN32OLE.new("Shell.Application").Namespace(fonts_dir)
89
88
  converge_by("install font #{new_resource.font_name} to #{fonts_dir}") do
@@ -95,7 +94,7 @@ class Chef
95
94
  #
96
95
  # @return [Boolean] Is the font is installed?
97
96
  def font_exists?
98
- require "win32ole" if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
97
+ require "win32ole" if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
99
98
  fonts_dir = WIN32OLE.new("WScript.Shell").SpecialFolders("Fonts")
100
99
  fonts_dir_local = Chef::Util::PathHelper.join(ENV["home"], "AppData/Local/Microsoft/Windows/fonts")
101
100
  logger.trace("Seeing if the font at #{Chef::Util::PathHelper.join(fonts_dir, new_resource.font_name)} exists")
@@ -26,7 +26,6 @@ class Chef
26
26
  class Resource
27
27
  class WindowsPackage < Chef::Resource::Package
28
28
  include Chef::Mixin::Uris
29
- unified_mode true
30
29
 
31
30
  provides(:windows_package) { true }
32
31
  provides :package, os: "windows"
@@ -20,7 +20,6 @@ require_relative "../resource"
20
20
  class Chef
21
21
  class Resource
22
22
  class WindowsPagefile < Chef::Resource
23
- unified_mode true
24
23
 
25
24
  provides(:windows_pagefile) { true }
26
25
 
@@ -166,7 +165,6 @@ class Chef
166
165
  # @return [Boolean]
167
166
  def max_and_min_set?(pagefile, min, max)
168
167
  logger.trace("Checking if #{pagefile} has max and initial disk size values set")
169
-
170
168
  powershell_code = <<-CODE
171
169
  $page_file = '#{pagefile}';
172
170
  $driveLetter = $page_file.split(':')[0];
@@ -23,7 +23,6 @@ require_relative "../resource"
23
23
  class Chef
24
24
  class Resource
25
25
  class WindowsPath < Chef::Resource
26
- unified_mode true
27
26
 
28
27
  provides(:windows_path) { true }
29
28
 
@@ -27,7 +27,6 @@ class Chef
27
27
  # 2. Fail with a warning if the port can't be found and create_port is false
28
28
  # 3. Fail with helpful messaging if the printer driver can't be installed
29
29
  class WindowsPrinter < Chef::Resource
30
- unified_mode true
31
30
 
32
31
  autoload :Resolv, "resolv"
33
32
 
@@ -23,7 +23,6 @@ require_relative "../resource"
23
23
  class Chef
24
24
  class Resource
25
25
  class WindowsPrinterPort < Chef::Resource
26
- unified_mode true
27
26
 
28
27
  autoload :Resolv, "resolv"
29
28
 
@@ -24,8 +24,6 @@ class Chef
24
24
  class WindowsScript < Chef::Resource::Script
25
25
  include Chef::Mixin::WindowsArchitectureHelper
26
26
 
27
- unified_mode true
28
-
29
27
  # This is an abstract resource meant to be subclasses; thus no 'provides'
30
28
 
31
29
  set_guard_inherited_attributes(:architecture)
@@ -22,7 +22,6 @@ require "tempfile" unless defined?(Tempfile)
22
22
  class Chef
23
23
  class Resource
24
24
  class WindowsSecurityPolicy < Chef::Resource
25
- unified_mode true
26
25
 
27
26
  provides :windows_security_policy
28
27
 
@@ -23,7 +23,6 @@ class Chef
23
23
  class Resource
24
24
  class WindowsService < Chef::Resource::Service
25
25
  include Chef::Win32ServiceConstants
26
- unified_mode true
27
26
 
28
27
  ALLOWED_START_TYPES = {
29
28
  automatic: SERVICE_AUTO_START,
@@ -25,7 +25,6 @@ require_relative "../util/path_helper"
25
25
  class Chef
26
26
  class Resource
27
27
  class WindowsShare < Chef::Resource
28
- unified_mode true
29
28
 
30
29
  provides :windows_share
31
30
 
@@ -21,7 +21,6 @@ require_relative "../resource"
21
21
  class Chef
22
22
  class Resource
23
23
  class WindowsShortcut < Chef::Resource
24
- unified_mode true
25
24
 
26
25
  provides(:windows_shortcut) { true }
27
26
 
@@ -58,7 +57,7 @@ class Chef
58
57
  description: "Icon to use for the shortcut. Accepts the format of `path, index`, where index is the icon file to use. See Microsoft's [documentation](https://msdn.microsoft.com/en-us/library/3s9bx7at.aspx) for details"
59
58
 
60
59
  load_current_value do |new_resource|
61
- require "win32ole" if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
60
+ require "win32ole" if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
62
61
 
63
62
  link = WIN32OLE.new("WScript.Shell").CreateShortcut(new_resource.shortcut_name)
64
63
  name new_resource.shortcut_name
@@ -27,7 +27,6 @@ require "win32/taskscheduler" if ChefUtils.windows_ruby?
27
27
  class Chef
28
28
  class Resource
29
29
  class WindowsTask < Chef::Resource
30
- unified_mode true
31
30
 
32
31
  provides(:windows_task) { true }
33
32
 
@@ -20,7 +20,6 @@ require_relative "../resource"
20
20
  class Chef
21
21
  class Resource
22
22
  class WindowsUac < Chef::Resource
23
- unified_mode true
24
23
 
25
24
  provides :windows_uac
26
25
 
@@ -23,7 +23,6 @@ require_relative "../resource"
23
23
  class Chef
24
24
  class Resource
25
25
  class WindowsUpdateSettings < Chef::Resource
26
- unified_mode true
27
26
 
28
27
  provides :windows_update_settings
29
28
 
@@ -21,7 +21,6 @@ require_relative "../resource"
21
21
  class Chef
22
22
  class Resource
23
23
  class WindowsUserPrivilege < Chef::Resource
24
- unified_mode true
25
24
 
26
25
  provides :windows_user_privilege
27
26
  description "The windows_user_privilege resource allows to add a privilege to a principal or (User/Group).\n Ref: https://docs.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/user-rights-assignment"
@@ -21,7 +21,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
21
21
  class Chef
22
22
  class Resource
23
23
  class WindowsWorkgroup < Chef::Resource
24
- unified_mode true
25
24
 
26
25
  provides :windows_workgroup
27
26
 
@@ -22,7 +22,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
22
22
  class Chef
23
23
  class Resource
24
24
  class YumPackage < Chef::Resource::Package
25
- unified_mode true
26
25
 
27
26
  provides :yum_package
28
27
  provides :package, platform_family: "fedora_derived"
@@ -21,7 +21,6 @@ require_relative "../resource"
21
21
  class Chef
22
22
  class Resource
23
23
  class YumRepository < Chef::Resource
24
- unified_mode true
25
24
 
26
25
  provides(:yum_repository) { true }
27
26
 
@@ -21,7 +21,6 @@ require_relative "package"
21
21
  class Chef
22
22
  class Resource
23
23
  class ZypperPackage < Chef::Resource::Package
24
- unified_mode true
25
24
 
26
25
  provides :zypper_package
27
26
  provides :package, platform_family: "suse"
@@ -21,7 +21,6 @@ require_relative "../resource"
21
21
  class Chef
22
22
  class Resource
23
23
  class ZypperRepository < Chef::Resource
24
- unified_mode true
25
24
 
26
25
  provides(:zypper_repository) { true }
27
26
  provides(:zypper_repo) { true } # legacy cookbook compatibility
data/lib/chef/resource.rb CHANGED
@@ -662,7 +662,6 @@ class Chef
662
662
  all_props = {}
663
663
 
664
664
  self.class.sensitive_properties.map do |p|
665
-
666
665
  all_props[p.name.to_s] = p.sensitive? ? '"*sensitive value suppressed*"' : value_to_text(p.get(self))
667
666
  rescue Chef::Exceptions::ValidationFailed
668
667
  # This space left intentionally blank, the property was probably required or had an invalid default.
@@ -1499,10 +1498,18 @@ class Chef
1499
1498
  # @param partial [String] the code fragment to eval against the class
1500
1499
  #
1501
1500
  def self.use(partial)
1502
- dirname = ::File.dirname(partial)
1503
- basename = ::File.basename(partial, ".rb")
1504
- basename = basename[1..] if basename.start_with?("_")
1505
- class_eval IO.read(::File.expand_path("#{dirname}/_#{basename}.rb", ::File.dirname(caller_locations.first.absolute_path)))
1501
+ if partial =~ /^core::(.*)/
1502
+ partial = $1
1503
+ dirname = ::File.dirname(partial)
1504
+ basename = ::File.basename(partial, ".rb")
1505
+ basename = basename[1..] if basename.start_with?("_")
1506
+ class_eval IO.read(::File.expand_path("resource/#{dirname}/_#{basename}.rb", __dir__))
1507
+ else
1508
+ dirname = ::File.dirname(partial)
1509
+ basename = ::File.basename(partial, ".rb")
1510
+ basename = basename[1..] if basename.start_with?("_")
1511
+ class_eval IO.read(::File.expand_path("#{dirname}/_#{basename}.rb", ::File.dirname(caller_locations.first.path)))
1512
+ end
1506
1513
  end
1507
1514
 
1508
1515
  # The cookbook in which this Resource was defined (if any).
@@ -124,6 +124,13 @@ require_relative "resource/route"
124
124
  require_relative "resource/ruby"
125
125
  require_relative "resource/ruby_block"
126
126
  require_relative "resource/script"
127
+ require_relative "resource/selinux_boolean"
128
+ require_relative "resource/selinux_fcontext"
129
+ require_relative "resource/selinux_install"
130
+ require_relative "resource/selinux_module"
131
+ require_relative "resource/selinux_permissive"
132
+ require_relative "resource/selinux_port"
133
+ require_relative "resource/selinux_state"
127
134
  require_relative "resource/service"
128
135
  require_relative "resource/sudo"
129
136
  require_relative "resource/sysctl"
@@ -413,9 +413,9 @@ class Chef
413
413
  logger.warn(<<~ERROR_MESSAGE)
414
414
  MissingCookbookDependency:
415
415
  Recipe `#{recipe_name}` is not in the run_list, and cookbook '#{cookbook_name}'
416
- is not a dependency of any cookbook in the run_list. To load this recipe,
417
- first add a dependency on cookbook '#{cookbook_name}' in the cookbook you're
418
- including it from in that cookbook's metadata.
416
+ is not a dependency of any cookbook in the run_list. To load this recipe,
417
+ first add a dependency of the cookbook '#{cookbook_name}' into the metadata
418
+ of the cookbook which depends on '#{cookbook_name}'.
419
419
  ERROR_MESSAGE
420
420
  end
421
421
 
@@ -59,7 +59,7 @@ class Chef
59
59
  end
60
60
 
61
61
  def validate!
62
- raise Chef::Exceptions::Secret::ConfigurationInvalid, "You may only specify one (these are mutually exclusive): :object_id, :client_id, or :mi_res_id" if [object_id, client_id, mi_res_id].count { |x| !x.nil? } > 1
62
+ raise Chef::Exceptions::Secret::ConfigurationInvalid, "You may only specify one (these are mutually exclusive): :object_id, :client_id, or :mi_res_id" if [config_object_id, client_id, mi_res_id].count { |x| !x.nil? } > 1
63
63
  end
64
64
 
65
65
  private
@@ -87,7 +87,7 @@ class Chef
87
87
  "https://vault.azure.net"
88
88
  end
89
89
 
90
- def object_id
90
+ def config_object_id
91
91
  config[:object_id]
92
92
  end
93
93
 
@@ -104,7 +104,7 @@ class Chef
104
104
  p = {}
105
105
  p["api-version"] = api_version
106
106
  p["resource"] = resource
107
- p["object_id"] = object_id if object_id
107
+ p["object_id"] = config_object_id if config_object_id
108
108
  p["client_id"] = client_id if client_id
109
109
  p["mi_res_id"] = mi_res_id if mi_res_id
110
110
  URI.encode_www_form(p)
data/lib/chef/version.rb CHANGED
@@ -23,7 +23,7 @@ require_relative "version_string"
23
23
 
24
24
  class Chef
25
25
  CHEF_ROOT = File.expand_path("..", __dir__)
26
- VERSION = Chef::VersionString.new("17.10.95")
26
+ VERSION = Chef::VersionString.new("18.0.169")
27
27
  end
28
28
 
29
29
  #
@@ -26,10 +26,6 @@ class Chef
26
26
  class Handle
27
27
  extend Chef::ReservedNames::Win32::API::Process
28
28
 
29
- # See http://msdn.microsoft.com/en-us/library/windows/desktop/ms683179(v=vs.85).aspx
30
- # The handle value returned by the GetCurrentProcess function is the pseudo handle (HANDLE)-1 (which is 0xFFFFFFFF)
31
- CURRENT_PROCESS_HANDLE = 4294967295
32
-
33
29
  def initialize(handle)
34
30
  @handle = handle
35
31
  ObjectSpace.define_finalizer(self, Handle.close_handle_finalizer(handle))
@@ -38,13 +34,16 @@ class Chef
38
34
  attr_reader :handle
39
35
 
40
36
  def self.close_handle_finalizer(handle)
37
+ proc { close_handle(handle) }
38
+ end
39
+
40
+ def self.close_handle(handle)
41
41
  # According to http://msdn.microsoft.com/en-us/library/windows/desktop/ms683179(v=vs.85).aspx, it is not necessary
42
42
  # to close the pseudo handle returned by the GetCurrentProcess function. The docs also say that it doesn't hurt to call
43
43
  # CloseHandle on it. However, doing so from inside of Ruby always seems to produce an invalid handle error.
44
- proc { close_handle(handle) unless handle == CURRENT_PROCESS_HANDLE }
45
- end
44
+ # The recommendation is to use GetCurrentProcess instead of the const (HANDLE)-1, to ensure we're making the correct comparison.
45
+ return if handle == GetCurrentProcess()
46
46
 
47
- def self.close_handle(handle)
48
47
  unless CloseHandle(handle)
49
48
  Chef::ReservedNames::Win32::Error.raise!
50
49
  end
@@ -20,7 +20,7 @@ require_relative "../reserved_names"
20
20
  require_relative "api"
21
21
  require_relative "../mixin/wide_string"
22
22
 
23
- if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
23
+ if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
24
24
  require "win32/api"
25
25
  module Win32
26
26
  autoload :Registry, File.expand_path("../monkey_patches/win32/registry", __dir__)
@@ -32,7 +32,7 @@ class Chef
32
32
  class Win32
33
33
  class Registry
34
34
 
35
- if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
35
+ if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
36
36
  include Chef::ReservedNames::Win32::API::Registry
37
37
  extend Chef::ReservedNames::Win32::API::Registry
38
38
  end
@@ -293,7 +293,11 @@ class Chef
293
293
  end
294
294
 
295
295
  def machine_architecture
296
- node[:kernel][:machine].to_sym
296
+ if node.nil?
297
+ ::RbConfig::CONFIG["target_cpu"] == "x64" ? :x86_64 : :i386
298
+ else
299
+ node[:kernel][:machine].to_sym
300
+ end
297
301
  end
298
302
 
299
303
  def assert_architecture!
@@ -46,4 +46,5 @@
46
46
  4.14.0 |checksum:99a20cc5e7b901f6b493a8ca5e13439b73b19671eaaca68a00216c4f66765edc
47
47
  4.14.1 |checksum:0fa8731445cf4a0c01570ec29aac4b50a0451ce66b1b31ad768f5035e3af7b90,ruby:~> 2.2
48
48
  4.15.0 |checksum:a5ec27d8055ad47444cfb7ce860bad8af2365772a82892f4a8a0d97e8e9e3b34,ruby:~> 2.2
49
- 4.15.1 |checksum:9291a0f2247f50d15068ee6965b67cd7b678b0d273e18adf3c0b2ea4a890125c,ruby:< 3.1&>= 2.1
49
+ 4.15.1 |checksum:9291a0f2247f50d15068ee6965b67cd7b678b0d273e18adf3c0b2ea4a890125c,ruby:>= 2.1
50
+ 4.16.1 |checksum:5caadbf4bbe5ab539cb892a5bcf74ca33a2f2a897cecafdee4a63be79b4819dc,ruby:>= 2.1
@@ -1,31 +1,22 @@
1
1
  -----BEGIN CERTIFICATE-----
2
- MIIFPTCCAyWgAwIBAgIUPv2sKSZA+KW0a4LxgUhiZG48AkswDQYJKoZIhvcNAQEL
3
- BQAwFzEVMBMGA1UEAwwMZXhhbXBsZS4uY29tMB4XDTIzMTAxNjE2MzM1M1oXDTMz
4
- MTAxMzE2MzM1M1owFzEVMBMGA1UEAwwMZXhhbXBsZS4uY29tMIICIjANBgkqhkiG
5
- 9w0BAQEFAAOCAg8AMIICCgKCAgEA1NKZJQY7B8xGnaERMX4laepq3u00q1nSDS6j
6
- 03qd1zZkW+ofMFlH5plBvULNO1jdAH9WwyMAwLu87R1QOx9fEz06J81Wtu7jheOU
7
- EHzn6NwWkUaX+j1oaIHIXrYnrUn5sW8w2wFEky82gPEG5SiZ6otKV2whX1ckSa3W
8
- ReFihEO/2/zxOEA0QzfIxFDW92wyAMDNM2/O/AMQB2jVxtWhYiqePXVUfQrIrLW1
9
- ytNmIWl7hoIHfVPgEoGLRe7kbT/QMTCd/lNrzF/rxUo+Aohq3WmVOdUCL4KdDnKS
10
- tlQFf8L4+9t19KiM9xX4GRMk9WWONk8rHln842ziv00bgD0rB3yZHlHJfGpkLdKv
11
- VZgcMHp31ZqVFzHapqHmXBVyEqxRIZSkZX4PN5bEdigz3Exf/vys+NAZKyJw35tn
12
- kF0+V/+vLlbvqZz98DDj+/KGgy7vaF3tBYBAC4px5yvnicDlBZS0GlrF1fufWQRQ
13
- 94n8LVcG47XjaEOufpzj5Xm6ZzTYDyiqO1+mszU6BQH8W8N+sZ+q7hPBkgRZ/WJF
14
- gXzNh5KPeDv47oXadYXOqNzXR7wkC11H5hmgQFrDCjuc0zTi/y7Iq+NxpkuQJIDD
15
- /4yNVTHM6GZSeBDH7rpkjL6coShU6fu2QxSofltpz4QxNtbquRtt3A2Se7obhC9g
16
- OeZfIqsCAwEAAaOBgDB+MB0GA1UdDgQWBBQ8JrC+u1bsL4QTJuIkH4MyZ2+ZWzAf
17
- BgNVHSMEGDAWgBQ8JrC+u1bsL4QTJuIkH4MyZ2+ZWzAPBgNVHRMBAf8EBTADAQH/
18
- MCsGA1UdEQQkMCKCC2V4YW1wbGUuY29tgg0qLmV4YW1wbGUuY29thwQKAAABMA0G
19
- CSqGSIb3DQEBCwUAA4ICAQAVFkQdpfoxzNu2VyhCtrCT8a1PA7Ko+ziPR0GWBxag
20
- kB3NRGzCVXENuX8OjLAsBRrYDTeUwIZJD2MWLqkhqs+8Bw08c9jdyezeWmgAL0I8
21
- aTiPET3CwVME78JPvxAJjmdayYFanniAbE3GMk+Bf2pvFTdPI8etY6Brv+uqBbyb
22
- 9pFspp2U05KRqTukVW2YJnWKfMR4VIBzOEA1maGwVMgnC3YPm3qsYqxXqr/jLDCg
23
- /EFoozne5/mNmvhSKWOUB1gsuv+3wiUOL6aZETY7RJPQADpHhJntCSeapb5DWhyr
24
- ZzUPGHbAyWqbfwmt7b9Pga4fQOihxi4Nf2ZnnMy32HQVqz2sOU7Fo/5rfejEQfGP
25
- jxt9b69Hydc3MQJF+eQVYS+NzaZyCX05kLqcGmIP4WKhjx3BkMaZVwjmYfE9WgKR
26
- Lcwq0aoz4Guh7Q0yICUc0PvxWLAkiXYFhthg05ZplTd+HgY3XCdO4DyG7lgL4b9t
27
- T6oqZv/7ivJbwTrvQXr6gGPhVq+120/mEw2qsdaQAp8v1ac5UgdCTViDkT45Ivox
28
- dS8VaqlVymvnLWAXtN92kQeb7bAhRmMZMNpFicFm8VS+alfijQDwhW5kOGpqtCrO
29
- f3QWYOehrqmHIuKw4ZhCYIy/OWkHR2j5iiZl8RFN2KhHZwLcmQTyxLaBk3SX1kCl
30
- qA==
2
+ MIIDkjCCAnoCCQDihI8kxGYTFTANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
3
+ VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMRAwDgYDVQQKEwdZb3VD
4
+ b3JwMRMwEQYDVQQLEwpPcGVyYXRpb25zMRYwFAYDVQQDEw1leGFtcGxlLmxvY2Fs
5
+ MR0wGwYJKoZIhvcNAQkBFg5tZUBleGFtcGxlLmNvbTAeFw0xMzEwMTcxODAxMzVa
6
+ Fw0yMzEwMTUxODAxMzVaMIGKMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAO
7
+ BgNVBAcTB1NlYXR0bGUxEDAOBgNVBAoTB1lvdUNvcnAxEzARBgNVBAsTCk9wZXJh
8
+ dGlvbnMxFjAUBgNVBAMTDWV4YW1wbGUubG9jYWwxHTAbBgkqhkiG9w0BCQEWDm1l
9
+ QGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyKBo
10
+ U+Bdni0xZK/NCzdLdi2X+TyW5eahbYMx+r1GDcVqCICvrthBCVLVFsQ8rvOHwTPi
11
+ AxQJGxb9TLSXRgXQSlH6FLjIUceuOtpan3qYVJ1v7AxY4DgNvYBpbtJz5MQedJnT
12
+ g2F+rXzkwaD6CWBqWHeGU0oP3r7bq1AMD6XEsK2w2/zHtG7TEnL45ARv1PsyrU5M
13
+ ZAW/XyoMyq1k2Lpv7YR5kAvTq1+4RSt/it2RFE7R0AVbaQ0MeAnllfySiHHHlaOT
14
+ FVd/qPSiGISxsUmmzA3Z08+0sfJwkrnJXbLscCBYndd7gMGgtczGjJtul0Ch3GFa
15
+ /Pn5McjwF272+usJ1wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCzPePWifWNECsG
16
+ nL8on1AtFMkczE1/pdRS4YUl/Tc926MpezptSja8rL31+4Bom37/wYPG7HygtAQl
17
+ R4FHpAtuqJKPOfjUmDNsIXRFnytrnflTpctDu/Nbj4PDCy01k/sTDUQt+s+lEBL8
18
+ M8ArmfLZ8PCfAwnXmJQ5rggDFKqegjt6z1RsSglbMiASE7+KkpBnzaqH6fET6IQz
19
+ WgAjv6WdRfwgfJjOTSX4XMpCSet9KaWmXExKrxiVng2Uu6E+ShVAyKaGMuc1B7VA
20
+ oxnnVaVapFv5lOWucQr4KkC7EgaUZnyt8duOc8+Yvd+y3Xd2dcHUnmegRxly4jRV
21
+ /lXbFAUb
31
22
  -----END CERTIFICATE-----
@@ -1,32 +1,36 @@
1
1
  -----BEGIN CERTIFICATE-----
2
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 4u4Pj0LlLdB8ufbCb5wr7bRXuGCWfwGAQrK9z5YlTxoCb9wmA80spM7xSQRewAb6
13
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- EZbXRhY3O58t7SlKWVCnx/JmEkJcRJtZaEReF1LbBayExYNnj/sD
2
+ MIIGPzCCBCegAwIBAgIJAKwtLqBeqNzfMA0GCSqGSIb3DQEBBQUAMHIxCzAJBgNV
3
+ BAYTAlVTMQswCQYDVQQIEwJXQTEQMA4GA1UEBxMHU2VhdHRsZTEQMA4GA1UEChMH
4
+ WW91Q29ycDETMBEGA1UECxMKT3BlcmF0aW9uczEdMBsGCSqGSIb3DQEJARYObWVA
5
+ ZXhhbXBsZS5jb20wHhcNMTYxMDMxMTkxMzQ2WhcNMjYxMDI5MTkxMzQ2WjByMQsw
6
+ CQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxEDAOBgNV
7
+ BAoTB1lvdUNvcnAxEzARBgNVBAsTCk9wZXJhdGlvbnMxHTAbBgkqhkiG9w0BCQEW
8
+ Dm1lQGV4YW1wbGUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
9
+ s1OiWnMV3shxVccqzenDBww5rSou9Ab/VqujKisJ54dXyHukYMxh9MJwlRDsy0FB
10
+ uKRAyNfhM43hSMYhtF7NS//D1lI/LDvIQkBaH8R834bvK102Avmsx7zKPOo/CUkd
11
+ g7uuL2eRzRszEuAREH1E7/PpTj11CjirG9i7FlbKj7vDA1Nqvtb0kHdiQuH2Cojy
12
+ Uf1uVFyE5UliFXtePDrxpOAfJUbcSdOLsK8olKHGCb0cfN/tCfbyEY8rHGsAUK2A
13
+ afuHRTR7pRQwfqJ5EK3DBbbFz+GSi+9zWFOudfqTsczS/HtpMbF8HBwqBAa+mpU/
14
+ UjmhpTYQ+rgVtWtEcttboeK6jvFBFLyQ6VRcrDi/8lmAnm1Q+RZk5g3GwZMhIMNU
15
+ 5XQZf6jsUsIFBuOaRyLn9dXkgyO7gOy8n8Yw+YdIFt29kaqZ6pu9kpS0jquxzSKj
16
+ MVS4OrThLwgazfQu/BlOvJpQfcNPI/VP9c41yHKpeoIh6oxNDc/212/wwgwPgD83
17
+ 8YXddupaSuE++h9Z10CCZgwux8deTlMjzETIMiIo8R3KV0pJgZ11akeJ8USr+QQ2
18
+ +fO/GdpNUa5nNTgF3t4zTF3DPToqj6KDgxLhUdXopF1hLYgwr8FKOtn9KXP+I0hz
19
+ hWzZoX9gwFLEPrUy265Gpw8TVTmNuSiiZtgJDSDKTBcCAwEAAaOB1zCB1DAdBgNV
20
+ HQ4EFgQUr5Y6dxhyVxfhwFsEKLDIXxQ2zBswgaQGA1UdIwSBnDCBmYAUr5Y6dxhy
21
+ VxfhwFsEKLDIXxQ2zBuhdqR0MHIxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJXQTEQ
22
+ MA4GA1UEBxMHU2VhdHRsZTEQMA4GA1UEChMHWW91Q29ycDETMBEGA1UECxMKT3Bl
23
+ cmF0aW9uczEdMBsGCSqGSIb3DQEJARYObWVAZXhhbXBsZS5jb22CCQCsLS6gXqjc
24
+ 3zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQBYXgqXAnocH6i8o47c
25
+ BZPMGO9y4LCB4YNIrZPKRNFvRl2aolA5KiBxr6WJp1iczxVA4lCmXU1LGfvRPHec
26
+ nHtVax3+Q1JCZhBSv/txQTjgn72qoJyCsPmjyWifbE1jFdRj0g74/Eu/0ku3L0vV
27
+ jTlqzJXQIzRkQm+Y5OrZo92tXaOgO+C0qdd6gaEaIIya6bzrBpW95NtVymhXi2Qf
28
+ 7G7Z/yw8XhoQiDJaPHF6XavC3dYvi51cehnPR4E6Jok23kbJEe3Qw5Yh747JjSsS
29
+ Sz07CKqTFcFjHI2f1sFdDjw34lj5mtOf3pEpRGGmvzkF8zm/sVQQ2rCKnqEe7zPy
30
+ Bg9guzVpORG+g76hGFZcYnz78LLNrIYcuYoLcbbZh404wjmifVKO5OC1dRgmJTuc
31
+ VnJe92568Y9cUAjrLztxp5gwXgYUllsXweJ2UGiHxSBqUfCCGG5vK5sYs52HR6wJ
32
+ wRSvwk/VHifYPxJ54RRB51ebYjmD1j41tRseHdFq21qpXSvr9DFLUJBvdN9zA/6t
33
+ xCBlXAdYxD0n0/bruUYNoXBeMhLp+WKSAQvTlVIyqoNQCo1OBBzBVNg9otl3jw5d
34
+ 1QOhodRqmS5UQAJptuXtk8WN8OZqMCCeogIfdpa5tJG+/fxFML9EvqedS4c05Wf/
35
+ oYdVLVWSjyoA2l4Xb4LdexAgCg==
32
36
  -----END CERTIFICATE-----