puppet 6.22.1-universal-darwin → 6.25.1-universal-darwin

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (415) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTING.md +5 -5
  3. data/Gemfile +2 -2
  4. data/Gemfile.lock +20 -20
  5. data/README.md +4 -4
  6. data/{ext → examples/enc}/regexp_nodes/classes/databases +0 -0
  7. data/{ext → examples/enc}/regexp_nodes/classes/webservers +0 -0
  8. data/{ext → examples/enc}/regexp_nodes/environment/development +0 -0
  9. data/{ext → examples/enc}/regexp_nodes/parameters/service/prod +0 -0
  10. data/{ext → examples/enc}/regexp_nodes/parameters/service/qa +0 -0
  11. data/{ext → examples/enc}/regexp_nodes/parameters/service/sandbox +0 -0
  12. data/{ext → examples/enc}/regexp_nodes/regexp_nodes.rb +0 -0
  13. data/{ext → examples}/nagios/check_puppet.rb +2 -2
  14. data/ext/README.md +13 -0
  15. data/ext/osx/puppet.plist +2 -0
  16. data/ext/project_data.yaml +1 -0
  17. data/lib/puppet/application/agent.rb +16 -5
  18. data/lib/puppet/application/apply.rb +22 -3
  19. data/lib/puppet/application/device.rb +2 -1
  20. data/lib/puppet/application/filebucket.rb +1 -0
  21. data/lib/puppet/application/resource.rb +32 -16
  22. data/lib/puppet/application/script.rb +2 -1
  23. data/lib/puppet/application/ssl.rb +1 -0
  24. data/lib/puppet/concurrent/thread_local_singleton.rb +1 -0
  25. data/lib/puppet/configurer/downloader.rb +2 -1
  26. data/lib/puppet/configurer.rb +144 -56
  27. data/lib/puppet/confine/variable.rb +1 -1
  28. data/lib/puppet/defaults.rb +47 -33
  29. data/lib/puppet/environments.rb +75 -25
  30. data/lib/puppet/face/facts.rb +1 -1
  31. data/lib/puppet/face/help/action.erb +1 -0
  32. data/lib/puppet/face/help/face.erb +1 -0
  33. data/lib/puppet/face/node/clean.rb +11 -0
  34. data/lib/puppet/facter_impl.rb +96 -0
  35. data/lib/puppet/file_serving/configuration/parser.rb +2 -0
  36. data/lib/puppet/file_serving/configuration.rb +3 -0
  37. data/lib/puppet/file_serving/fileset.rb +14 -2
  38. data/lib/puppet/file_serving/mount/file.rb +4 -4
  39. data/lib/puppet/file_serving/mount/scripts.rb +24 -0
  40. data/lib/puppet/file_system/file_impl.rb +3 -1
  41. data/lib/puppet/file_system/windows.rb +2 -2
  42. data/lib/puppet/forge.rb +4 -4
  43. data/lib/puppet/functions/all.rb +1 -1
  44. data/lib/puppet/functions/camelcase.rb +1 -1
  45. data/lib/puppet/functions/capitalize.rb +2 -2
  46. data/lib/puppet/functions/downcase.rb +2 -2
  47. data/lib/puppet/functions/empty.rb +8 -0
  48. data/lib/puppet/functions/find_template.rb +2 -2
  49. data/lib/puppet/functions/get.rb +5 -5
  50. data/lib/puppet/functions/group_by.rb +13 -5
  51. data/lib/puppet/functions/lest.rb +1 -1
  52. data/lib/puppet/functions/new.rb +100 -100
  53. data/lib/puppet/functions/partition.rb +4 -4
  54. data/lib/puppet/functions/require.rb +5 -5
  55. data/lib/puppet/functions/sort.rb +3 -3
  56. data/lib/puppet/functions/strftime.rb +1 -0
  57. data/lib/puppet/functions/tree_each.rb +7 -9
  58. data/lib/puppet/functions/type.rb +4 -4
  59. data/lib/puppet/functions/unwrap.rb +17 -2
  60. data/lib/puppet/functions/upcase.rb +2 -2
  61. data/lib/puppet/http/client.rb +1 -1
  62. data/lib/puppet/http/redirector.rb +5 -0
  63. data/lib/puppet/http/resolver/server_list.rb +15 -4
  64. data/lib/puppet/http/service/compiler.rb +75 -1
  65. data/lib/puppet/http/service/file_server.rb +2 -1
  66. data/lib/puppet/indirector/catalog/compiler.rb +25 -6
  67. data/lib/puppet/indirector/catalog/rest.rb +1 -0
  68. data/lib/puppet/indirector/facts/facter.rb +6 -6
  69. data/lib/puppet/indirector/file_metadata/rest.rb +1 -0
  70. data/lib/puppet/indirector/indirection.rb +1 -1
  71. data/lib/puppet/indirector/resource/ral.rb +6 -1
  72. data/lib/puppet/indirector/terminus.rb +4 -0
  73. data/lib/puppet/interface/documentation.rb +1 -0
  74. data/lib/puppet/module/plan.rb +0 -1
  75. data/lib/puppet/module/task.rb +1 -1
  76. data/lib/puppet/module.rb +1 -0
  77. data/lib/puppet/module_tool/applications/installer.rb +12 -4
  78. data/lib/puppet/module_tool/applications/uninstaller.rb +1 -1
  79. data/lib/puppet/module_tool/applications/upgrader.rb +1 -1
  80. data/lib/puppet/module_tool/errors/shared.rb +17 -0
  81. data/lib/puppet/network/http/api/indirected_routes.rb +1 -1
  82. data/lib/puppet/node/environment.rb +10 -11
  83. data/lib/puppet/pal/pal_impl.rb +1 -1
  84. data/lib/puppet/parser/functions/fqdn_rand.rb +14 -6
  85. data/lib/puppet/parser/resource.rb +1 -1
  86. data/lib/puppet/parser/scope.rb +1 -0
  87. data/lib/puppet/parser/templatewrapper.rb +1 -0
  88. data/lib/puppet/pops/evaluator/closure.rb +7 -5
  89. data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +1 -0
  90. data/lib/puppet/pops/lookup/lookup_adapter.rb +3 -2
  91. data/lib/puppet/pops/model/ast.rb +1 -0
  92. data/lib/puppet/pops/model/factory.rb +2 -1
  93. data/lib/puppet/pops/parser/eparser.rb +201 -201
  94. data/lib/puppet/pops/parser/lexer2.rb +92 -91
  95. data/lib/puppet/pops/parser/slurp_support.rb +1 -0
  96. data/lib/puppet/pops/serialization/to_data_converter.rb +18 -6
  97. data/lib/puppet/pops/serialization/to_stringified_converter.rb +1 -1
  98. data/lib/puppet/pops/types/p_sem_ver_type.rb +8 -2
  99. data/lib/puppet/pops/types/p_sensitive_type.rb +10 -0
  100. data/lib/puppet/pops/types/type_formatter.rb +4 -3
  101. data/lib/puppet/pops/types/type_mismatch_describer.rb +1 -1
  102. data/lib/puppet/pops/types/types.rb +1 -1
  103. data/lib/puppet/provider/aix_object.rb +1 -1
  104. data/lib/puppet/provider/exec/posix.rb +16 -4
  105. data/lib/puppet/provider/group/groupadd.rb +5 -2
  106. data/lib/puppet/provider/package/nim.rb +11 -6
  107. data/lib/puppet/provider/package/pip.rb +15 -3
  108. data/lib/puppet/provider/package/pkg.rb +19 -2
  109. data/lib/puppet/provider/package/puppetserver_gem.rb +1 -1
  110. data/lib/puppet/provider/package/yum.rb +1 -1
  111. data/lib/puppet/provider/parsedfile.rb +3 -0
  112. data/lib/puppet/provider/service/base.rb +1 -1
  113. data/lib/puppet/provider/service/init.rb +5 -5
  114. data/lib/puppet/provider/service/launchd.rb +2 -2
  115. data/lib/puppet/provider/service/redhat.rb +1 -1
  116. data/lib/puppet/provider/service/smf.rb +3 -3
  117. data/lib/puppet/provider/service/systemd.rb +15 -5
  118. data/lib/puppet/provider/service/upstart.rb +5 -5
  119. data/lib/puppet/provider/service/windows.rb +38 -0
  120. data/lib/puppet/provider/user/aix.rb +44 -1
  121. data/lib/puppet/provider/user/directoryservice.rb +26 -13
  122. data/lib/puppet/provider/user/useradd.rb +72 -16
  123. data/lib/puppet/provider.rb +1 -1
  124. data/lib/puppet/reference/configuration.rb +1 -1
  125. data/lib/puppet/reference/providers.rb +2 -2
  126. data/lib/puppet/resource/catalog.rb +1 -1
  127. data/lib/puppet/resource/type_collection.rb +1 -0
  128. data/lib/puppet/resource.rb +38 -5
  129. data/lib/puppet/runtime.rb +11 -1
  130. data/lib/puppet/settings.rb +32 -9
  131. data/lib/puppet/test/test_helper.rb +4 -1
  132. data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
  133. data/lib/puppet/transaction/persistence.rb +11 -1
  134. data/lib/puppet/transaction/report.rb +15 -1
  135. data/lib/puppet/type/exec.rb +35 -5
  136. data/lib/puppet/type/file/mode.rb +6 -0
  137. data/lib/puppet/type/file/selcontext.rb +1 -1
  138. data/lib/puppet/type/file.rb +25 -7
  139. data/lib/puppet/type/filebucket.rb +3 -3
  140. data/lib/puppet/type/group.rb +0 -1
  141. data/lib/puppet/type/resources.rb +1 -1
  142. data/lib/puppet/type/service.rb +26 -41
  143. data/lib/puppet/type/tidy.rb +22 -3
  144. data/lib/puppet/type/user.rb +38 -21
  145. data/lib/puppet/type.rb +1 -1
  146. data/lib/puppet/util/command_line.rb +1 -1
  147. data/lib/puppet/util/filetype.rb +2 -2
  148. data/lib/puppet/util/json.rb +3 -0
  149. data/lib/puppet/util/log.rb +1 -2
  150. data/lib/puppet/util/logging.rb +1 -25
  151. data/lib/puppet/util/pidlock.rb +1 -1
  152. data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +1 -1
  153. data/lib/puppet/util/selinux.rb +30 -4
  154. data/lib/puppet/util/suidmanager.rb +1 -2
  155. data/lib/puppet/util/symbolic_file_mode.rb +29 -17
  156. data/lib/puppet/util/tagging.rb +1 -0
  157. data/lib/puppet/util/windows/service.rb +0 -5
  158. data/lib/puppet/util/windows/sid.rb +3 -1
  159. data/lib/puppet/util/windows/user.rb +0 -2
  160. data/lib/puppet/util/windows.rb +3 -0
  161. data/lib/puppet/util.rb +4 -3
  162. data/lib/puppet/version.rb +1 -1
  163. data/lib/puppet.rb +5 -9
  164. data/locales/puppet.pot +408 -364
  165. data/man/man5/puppet.conf.5 +303 -275
  166. data/man/man8/puppet-agent.8 +4 -1
  167. data/man/man8/puppet-apply.8 +1 -1
  168. data/man/man8/puppet-catalog.8 +9 -9
  169. data/man/man8/puppet-config.8 +1 -1
  170. data/man/man8/puppet-describe.8 +1 -1
  171. data/man/man8/puppet-device.8 +1 -1
  172. data/man/man8/puppet-doc.8 +1 -1
  173. data/man/man8/puppet-epp.8 +1 -1
  174. data/man/man8/puppet-facts.8 +8 -8
  175. data/man/man8/puppet-filebucket.8 +1 -1
  176. data/man/man8/puppet-generate.8 +1 -1
  177. data/man/man8/puppet-help.8 +1 -1
  178. data/man/man8/puppet-key.8 +7 -7
  179. data/man/man8/puppet-lookup.8 +1 -1
  180. data/man/man8/puppet-man.8 +1 -1
  181. data/man/man8/puppet-module.8 +3 -3
  182. data/man/man8/puppet-node.8 +5 -5
  183. data/man/man8/puppet-parser.8 +1 -1
  184. data/man/man8/puppet-plugin.8 +1 -1
  185. data/man/man8/puppet-report.8 +5 -5
  186. data/man/man8/puppet-resource.8 +1 -1
  187. data/man/man8/puppet-script.8 +1 -1
  188. data/man/man8/puppet-ssl.8 +1 -1
  189. data/man/man8/puppet-status.8 +4 -4
  190. data/man/man8/puppet.8 +2 -2
  191. data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +2 -1
  192. data/spec/fixtures/integration/application/agent/lib/facter/agent_spec_role.rb +3 -0
  193. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/Gemfile +4 -0
  194. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/Rakefile +3 -0
  195. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/lib/puppet/functions/l10n.rb +8 -0
  196. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/config.yaml +25 -0
  197. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/ja/puppet-l10n.po +19 -0
  198. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/puppet-l10n.pot +20 -0
  199. data/spec/fixtures/integration/l10n/envs/prod/modules/demo/metadata.json +8 -0
  200. data/spec/fixtures/ssl/127.0.0.1-key.pem +107 -57
  201. data/spec/fixtures/ssl/127.0.0.1.pem +52 -31
  202. data/spec/fixtures/ssl/bad-basic-constraints.pem +57 -35
  203. data/spec/fixtures/ssl/bad-int-basic-constraints.pem +57 -35
  204. data/spec/fixtures/ssl/ca.pem +57 -35
  205. data/spec/fixtures/ssl/crl.pem +28 -18
  206. data/spec/fixtures/ssl/ec-key.pem +11 -11
  207. data/spec/fixtures/ssl/ec.pem +33 -24
  208. data/spec/fixtures/ssl/encrypted-ec-key.pem +12 -12
  209. data/spec/fixtures/ssl/encrypted-key.pem +108 -58
  210. data/spec/fixtures/ssl/intermediate-agent-crl.pem +28 -19
  211. data/spec/fixtures/ssl/intermediate-agent.pem +57 -36
  212. data/spec/fixtures/ssl/intermediate-crl.pem +31 -21
  213. data/spec/fixtures/ssl/intermediate.pem +57 -36
  214. data/spec/fixtures/ssl/oid-key.pem +117 -0
  215. data/spec/fixtures/ssl/oid.pem +69 -0
  216. data/spec/fixtures/ssl/pluto-key.pem +107 -57
  217. data/spec/fixtures/ssl/pluto.pem +52 -30
  218. data/spec/fixtures/ssl/request-key.pem +107 -57
  219. data/spec/fixtures/ssl/request.pem +47 -26
  220. data/spec/fixtures/ssl/revoked-key.pem +107 -57
  221. data/spec/fixtures/ssl/revoked.pem +52 -30
  222. data/spec/fixtures/ssl/signed-key.pem +107 -57
  223. data/spec/fixtures/ssl/signed.pem +52 -30
  224. data/spec/fixtures/ssl/tampered-cert.pem +52 -30
  225. data/spec/fixtures/ssl/tampered-csr.pem +47 -26
  226. data/spec/fixtures/ssl/trusted_oid_mapping.yaml +5 -0
  227. data/spec/fixtures/ssl/unknown-127.0.0.1-key.pem +107 -57
  228. data/spec/fixtures/ssl/unknown-127.0.0.1.pem +50 -29
  229. data/spec/fixtures/ssl/unknown-ca-key.pem +107 -57
  230. data/spec/fixtures/ssl/unknown-ca.pem +55 -33
  231. data/spec/integration/application/agent_spec.rb +141 -37
  232. data/spec/integration/application/filebucket_spec.rb +16 -0
  233. data/spec/integration/application/module_spec.rb +21 -0
  234. data/spec/integration/application/resource_spec.rb +64 -0
  235. data/spec/integration/application/ssl_spec.rb +20 -0
  236. data/spec/integration/configurer_spec.rb +18 -2
  237. data/spec/integration/environments/settings_interpolation_spec.rb +0 -4
  238. data/spec/integration/indirector/facts/facter_spec.rb +93 -39
  239. data/spec/integration/l10n/compiler_spec.rb +37 -0
  240. data/spec/integration/parser/pcore_resource_spec.rb +10 -0
  241. data/spec/integration/transaction/report_spec.rb +1 -1
  242. data/spec/integration/type/exec_spec.rb +70 -45
  243. data/spec/integration/type/file_spec.rb +2 -2
  244. data/spec/integration/type/package_spec.rb +6 -6
  245. data/spec/integration/util/rdoc/parser_spec.rb +1 -1
  246. data/spec/integration/util/windows/process_spec.rb +1 -9
  247. data/spec/lib/puppet/test_ca.rb +7 -2
  248. data/spec/lib/puppet_spec/modules.rb +13 -2
  249. data/spec/lib/puppet_spec/puppetserver.rb +15 -0
  250. data/spec/lib/puppet_spec/settings.rb +1 -0
  251. data/spec/shared_behaviours/documentation_on_faces.rb +0 -2
  252. data/spec/shared_contexts/l10n.rb +27 -0
  253. data/spec/spec_helper.rb +1 -10
  254. data/spec/unit/application/agent_spec.rb +7 -2
  255. data/spec/unit/application/apply_spec.rb +76 -56
  256. data/spec/unit/application/resource_spec.rb +29 -0
  257. data/spec/unit/configurer/downloader_spec.rb +6 -0
  258. data/spec/unit/configurer_spec.rb +256 -57
  259. data/spec/unit/defaults_spec.rb +1 -0
  260. data/spec/unit/environments_spec.rb +184 -0
  261. data/spec/unit/facter_impl_spec.rb +31 -0
  262. data/spec/unit/file_bucket/dipper_spec.rb +2 -2
  263. data/spec/unit/file_serving/configuration/parser_spec.rb +23 -0
  264. data/spec/unit/file_serving/configuration_spec.rb +14 -4
  265. data/spec/unit/file_serving/fileset_spec.rb +60 -0
  266. data/spec/unit/file_serving/mount/scripts_spec.rb +69 -0
  267. data/spec/unit/file_system_spec.rb +13 -0
  268. data/spec/unit/functions/assert_type_spec.rb +1 -1
  269. data/spec/unit/functions/empty_spec.rb +10 -0
  270. data/spec/unit/functions/logging_spec.rb +1 -0
  271. data/spec/unit/functions/lookup_spec.rb +64 -0
  272. data/spec/unit/functions/unwrap_spec.rb +8 -0
  273. data/spec/unit/functions4_spec.rb +2 -2
  274. data/spec/unit/gettext/config_spec.rb +12 -0
  275. data/spec/unit/http/client_spec.rb +58 -1
  276. data/spec/unit/http/service/compiler_spec.rb +131 -0
  277. data/spec/unit/indirector/catalog/compiler_spec.rb +101 -10
  278. data/spec/unit/indirector/catalog/rest_spec.rb +8 -0
  279. data/spec/unit/indirector/indirection_spec.rb +10 -3
  280. data/spec/unit/indirector/resource/ral_spec.rb +40 -75
  281. data/spec/unit/interface/action_spec.rb +0 -9
  282. data/spec/unit/module_spec.rb +15 -1
  283. data/spec/unit/module_tool/applications/installer_spec.rb +51 -12
  284. data/spec/unit/network/authstore_spec.rb +0 -15
  285. data/spec/unit/network/formats_spec.rb +6 -0
  286. data/spec/unit/parser/functions/fqdn_rand_spec.rb +15 -1
  287. data/spec/unit/parser/templatewrapper_spec.rb +12 -2
  288. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -11
  289. data/spec/unit/pops/serialization/to_from_hr_spec.rb +58 -0
  290. data/spec/unit/pops/serialization/to_stringified_spec.rb +5 -0
  291. data/spec/unit/pops/types/p_sem_ver_type_spec.rb +18 -0
  292. data/spec/unit/pops/types/p_sensitive_type_spec.rb +18 -0
  293. data/spec/unit/pops/types/type_calculator_spec.rb +6 -0
  294. data/spec/unit/provider/package/gem_spec.rb +1 -1
  295. data/spec/unit/provider/package/nim_spec.rb +42 -0
  296. data/spec/unit/provider/package/pip2_spec.rb +1 -1
  297. data/spec/unit/provider/package/pip3_spec.rb +1 -1
  298. data/spec/unit/provider/package/pip_spec.rb +38 -1
  299. data/spec/unit/provider/package/pkg_spec.rb +29 -4
  300. data/spec/unit/provider/package/puppet_gem_spec.rb +1 -1
  301. data/spec/unit/provider/package/puppetserver_gem_spec.rb +1 -1
  302. data/spec/unit/provider/parsedfile_spec.rb +10 -0
  303. data/spec/unit/provider/service/init_spec.rb +1 -0
  304. data/spec/unit/provider/service/launchd_spec.rb +11 -0
  305. data/spec/unit/provider/service/openwrt_spec.rb +3 -1
  306. data/spec/unit/provider/service/systemd_spec.rb +43 -9
  307. data/spec/unit/provider/service/windows_spec.rb +202 -0
  308. data/spec/unit/provider/user/aix_spec.rb +100 -0
  309. data/spec/unit/provider/user/directoryservice_spec.rb +68 -36
  310. data/spec/unit/provider/user/useradd_spec.rb +43 -2
  311. data/spec/unit/provider_spec.rb +4 -4
  312. data/spec/unit/puppet_spec.rb +12 -4
  313. data/spec/unit/resource/catalog_spec.rb +14 -1
  314. data/spec/unit/resource_spec.rb +58 -2
  315. data/spec/unit/settings_spec.rb +97 -56
  316. data/spec/unit/ssl/certificate_request_spec.rb +8 -14
  317. data/spec/unit/ssl/state_machine_spec.rb +19 -5
  318. data/spec/unit/transaction/additional_resource_generator_spec.rb +0 -2
  319. data/spec/unit/transaction_spec.rb +18 -20
  320. data/spec/unit/type/exec_spec.rb +76 -29
  321. data/spec/unit/type/file/selinux_spec.rb +3 -3
  322. data/spec/unit/type/file/source_spec.rb +4 -4
  323. data/spec/unit/type/service_spec.rb +86 -188
  324. data/spec/unit/type/tidy_spec.rb +24 -7
  325. data/spec/unit/type/user_spec.rb +45 -0
  326. data/spec/unit/type_spec.rb +2 -2
  327. data/spec/unit/util/logging_spec.rb +2 -0
  328. data/spec/unit/util/selinux_spec.rb +87 -16
  329. data/spec/unit/util/windows/sid_spec.rb +39 -4
  330. data/tasks/generate_cert_fixtures.rake +12 -3
  331. data/tasks/parallel.rake +3 -3
  332. metadata +49 -95
  333. data/ext/README.environment +0 -8
  334. data/ext/dbfix.sql +0 -132
  335. data/ext/debian/README.Debian +0 -8
  336. data/ext/debian/README.source +0 -2
  337. data/ext/debian/TODO.Debian +0 -1
  338. data/ext/debian/changelog.erb +0 -1122
  339. data/ext/debian/compat +0 -1
  340. data/ext/debian/control +0 -144
  341. data/ext/debian/copyright +0 -339
  342. data/ext/debian/docs +0 -1
  343. data/ext/debian/fileserver.conf +0 -41
  344. data/ext/debian/puppet-common.dirs +0 -13
  345. data/ext/debian/puppet-common.install +0 -3
  346. data/ext/debian/puppet-common.lintian-overrides +0 -5
  347. data/ext/debian/puppet-common.manpages +0 -28
  348. data/ext/debian/puppet-common.postinst +0 -35
  349. data/ext/debian/puppet-common.postrm +0 -33
  350. data/ext/debian/puppet-el.dirs +0 -1
  351. data/ext/debian/puppet-el.emacsen-install +0 -25
  352. data/ext/debian/puppet-el.emacsen-remove +0 -11
  353. data/ext/debian/puppet-el.emacsen-startup +0 -9
  354. data/ext/debian/puppet-el.install +0 -1
  355. data/ext/debian/puppet-testsuite.install +0 -2
  356. data/ext/debian/puppet-testsuite.lintian-overrides +0 -4
  357. data/ext/debian/puppet.lintian-overrides +0 -3
  358. data/ext/debian/puppet.logrotate +0 -20
  359. data/ext/debian/puppet.postinst +0 -20
  360. data/ext/debian/puppet.postrm +0 -20
  361. data/ext/debian/puppet.preinst +0 -20
  362. data/ext/debian/puppetmaster-common.install +0 -2
  363. data/ext/debian/puppetmaster-common.manpages +0 -2
  364. data/ext/debian/puppetmaster-common.postinst +0 -6
  365. data/ext/debian/puppetmaster-passenger.dirs +0 -4
  366. data/ext/debian/puppetmaster-passenger.postinst +0 -162
  367. data/ext/debian/puppetmaster-passenger.postrm +0 -61
  368. data/ext/debian/puppetmaster.README.debian +0 -17
  369. data/ext/debian/puppetmaster.default +0 -14
  370. data/ext/debian/puppetmaster.init +0 -137
  371. data/ext/debian/puppetmaster.lintian-overrides +0 -3
  372. data/ext/debian/puppetmaster.postinst +0 -20
  373. data/ext/debian/puppetmaster.postrm +0 -5
  374. data/ext/debian/puppetmaster.preinst +0 -22
  375. data/ext/debian/rules +0 -132
  376. data/ext/debian/source/format +0 -1
  377. data/ext/debian/source/options +0 -1
  378. data/ext/debian/vim-puppet.README.Debian +0 -13
  379. data/ext/debian/vim-puppet.dirs +0 -5
  380. data/ext/debian/vim-puppet.yaml +0 -7
  381. data/ext/debian/watch +0 -2
  382. data/ext/freebsd/puppetd +0 -26
  383. data/ext/freebsd/puppetmasterd +0 -26
  384. data/ext/gentoo/conf.d/puppet +0 -5
  385. data/ext/gentoo/conf.d/puppetmaster +0 -12
  386. data/ext/gentoo/init.d/puppet +0 -38
  387. data/ext/gentoo/init.d/puppetmaster +0 -51
  388. data/ext/gentoo/puppet/fileserver.conf +0 -41
  389. data/ext/ips/puppet-agent +0 -44
  390. data/ext/ips/puppet-master +0 -44
  391. data/ext/ips/puppet.p5m.erb +0 -12
  392. data/ext/ips/puppetagent.xml +0 -42
  393. data/ext/ips/puppetmaster.xml +0 -42
  394. data/ext/ips/rules +0 -19
  395. data/ext/ips/transforms +0 -34
  396. data/ext/ldap/puppet.schema +0 -24
  397. data/ext/logcheck/puppet +0 -23
  398. data/ext/osx/file_mapping.yaml +0 -33
  399. data/ext/osx/postflight.erb +0 -109
  400. data/ext/osx/preflight.erb +0 -52
  401. data/ext/osx/prototype.plist.erb +0 -38
  402. data/ext/redhat/fileserver.conf +0 -41
  403. data/ext/redhat/logrotate +0 -21
  404. data/ext/redhat/puppet.spec.erb +0 -842
  405. data/ext/redhat/server.init +0 -128
  406. data/ext/redhat/server.sysconfig +0 -13
  407. data/ext/solaris/pkginfo +0 -6
  408. data/ext/solaris/smf/puppetd.xml +0 -77
  409. data/ext/solaris/smf/puppetmasterd.xml +0 -77
  410. data/ext/solaris/smf/svc-puppetd +0 -71
  411. data/ext/solaris/smf/svc-puppetmasterd +0 -67
  412. data/ext/suse/puppet.spec +0 -310
  413. data/ext/suse/server.init +0 -173
  414. data/ext/yaml_nodes.rb +0 -105
  415. data/spec/unit/indirector/store_configs_spec.rb +0 -7
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.22.1
4
+ version: 6.25.1
5
5
  platform: universal-darwin
6
6
  authors:
7
7
  - Puppet Labs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-04-22 00:00:00.000000000 Z
11
+ date: 2021-10-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: facter
@@ -198,6 +198,13 @@ files:
198
198
  - conf/fileserver.conf
199
199
  - conf/hiera.yaml
200
200
  - conf/puppet.conf
201
+ - examples/enc/regexp_nodes/classes/databases
202
+ - examples/enc/regexp_nodes/classes/webservers
203
+ - examples/enc/regexp_nodes/environment/development
204
+ - examples/enc/regexp_nodes/parameters/service/prod
205
+ - examples/enc/regexp_nodes/parameters/service/qa
206
+ - examples/enc/regexp_nodes/parameters/service/sandbox
207
+ - examples/enc/regexp_nodes/regexp_nodes.rb
201
208
  - examples/hiera/README.md
202
209
  - examples/hiera/etc/hiera.yaml
203
210
  - examples/hiera/etc/hieradb/common.yaml
@@ -212,113 +219,25 @@ files:
212
219
  - examples/hiera/modules/users/manifests/dc1.pp
213
220
  - examples/hiera/modules/users/manifests/development.pp
214
221
  - examples/hiera/site.pp
215
- - ext/README.environment
222
+ - examples/nagios/check_puppet.rb
223
+ - ext/README.md
216
224
  - ext/build_defaults.yaml
217
- - ext/dbfix.sql
218
- - ext/debian/README.Debian
219
- - ext/debian/README.source
220
- - ext/debian/TODO.Debian
221
- - ext/debian/changelog.erb
222
- - ext/debian/compat
223
- - ext/debian/control
224
- - ext/debian/copyright
225
- - ext/debian/docs
226
- - ext/debian/fileserver.conf
227
- - ext/debian/puppet-common.dirs
228
- - ext/debian/puppet-common.install
229
- - ext/debian/puppet-common.lintian-overrides
230
- - ext/debian/puppet-common.manpages
231
- - ext/debian/puppet-common.postinst
232
- - ext/debian/puppet-common.postrm
233
- - ext/debian/puppet-el.dirs
234
- - ext/debian/puppet-el.emacsen-install
235
- - ext/debian/puppet-el.emacsen-remove
236
- - ext/debian/puppet-el.emacsen-startup
237
- - ext/debian/puppet-el.install
238
- - ext/debian/puppet-testsuite.install
239
- - ext/debian/puppet-testsuite.lintian-overrides
240
225
  - ext/debian/puppet.default
241
226
  - ext/debian/puppet.init
242
- - ext/debian/puppet.lintian-overrides
243
- - ext/debian/puppet.logrotate
244
- - ext/debian/puppet.postinst
245
- - ext/debian/puppet.postrm
246
- - ext/debian/puppet.preinst
247
- - ext/debian/puppetmaster-common.install
248
- - ext/debian/puppetmaster-common.manpages
249
- - ext/debian/puppetmaster-common.postinst
250
- - ext/debian/puppetmaster-passenger.dirs
251
- - ext/debian/puppetmaster-passenger.postinst
252
- - ext/debian/puppetmaster-passenger.postrm
253
- - ext/debian/puppetmaster.README.debian
254
- - ext/debian/puppetmaster.default
255
- - ext/debian/puppetmaster.init
256
- - ext/debian/puppetmaster.lintian-overrides
257
- - ext/debian/puppetmaster.postinst
258
- - ext/debian/puppetmaster.postrm
259
- - ext/debian/puppetmaster.preinst
260
- - ext/debian/rules
261
- - ext/debian/source/format
262
- - ext/debian/source/options
263
- - ext/debian/vim-puppet.README.Debian
264
- - ext/debian/vim-puppet.dirs
265
- - ext/debian/vim-puppet.yaml
266
- - ext/debian/watch
267
- - ext/freebsd/puppetd
268
- - ext/freebsd/puppetmasterd
269
- - ext/gentoo/conf.d/puppet
270
- - ext/gentoo/conf.d/puppetmaster
271
- - ext/gentoo/init.d/puppet
272
- - ext/gentoo/init.d/puppetmaster
273
- - ext/gentoo/puppet/fileserver.conf
274
227
  - ext/hiera/hiera.yaml
275
- - ext/ips/puppet-agent
276
- - ext/ips/puppet-master
277
- - ext/ips/puppet.p5m.erb
278
- - ext/ips/puppetagent.xml
279
- - ext/ips/puppetmaster.xml
280
- - ext/ips/rules
281
- - ext/ips/transforms
282
- - ext/ldap/puppet.schema
283
- - ext/logcheck/puppet
284
- - ext/nagios/check_puppet.rb
285
- - ext/osx/file_mapping.yaml
286
- - ext/osx/postflight.erb
287
- - ext/osx/preflight.erb
288
- - ext/osx/prototype.plist.erb
289
228
  - ext/osx/puppet.plist
290
229
  - ext/project_data.yaml
291
230
  - ext/redhat/client.init
292
231
  - ext/redhat/client.sysconfig
293
- - ext/redhat/fileserver.conf
294
- - ext/redhat/logrotate
295
- - ext/redhat/puppet.spec.erb
296
- - ext/redhat/server.init
297
- - ext/redhat/server.sysconfig
298
- - ext/regexp_nodes/classes/databases
299
- - ext/regexp_nodes/classes/webservers
300
- - ext/regexp_nodes/environment/development
301
- - ext/regexp_nodes/parameters/service/prod
302
- - ext/regexp_nodes/parameters/service/qa
303
- - ext/regexp_nodes/parameters/service/sandbox
304
- - ext/regexp_nodes/regexp_nodes.rb
305
- - ext/solaris/pkginfo
306
232
  - ext/solaris/smf/puppet
307
233
  - ext/solaris/smf/puppet.xml
308
- - ext/solaris/smf/puppetd.xml
309
- - ext/solaris/smf/puppetmasterd.xml
310
- - ext/solaris/smf/svc-puppetd
311
- - ext/solaris/smf/svc-puppetmasterd
312
234
  - ext/suse/client.init
313
- - ext/suse/puppet.spec
314
- - ext/suse/server.init
315
235
  - ext/systemd/puppet.service
316
236
  - ext/windows/puppet_interactive.bat
317
237
  - ext/windows/puppet_shell.bat
318
238
  - ext/windows/run_puppet_interactive.bat
319
239
  - ext/windows/service/daemon.bat
320
240
  - ext/windows/service/daemon.rb
321
- - ext/yaml_nodes.rb
322
241
  - install.rb
323
242
  - lib/hiera/puppet_function.rb
324
243
  - lib/hiera/scope.rb
@@ -423,6 +342,7 @@ files:
423
342
  - lib/puppet/face/report.rb
424
343
  - lib/puppet/face/resource.rb
425
344
  - lib/puppet/face/status.rb
345
+ - lib/puppet/facter_impl.rb
426
346
  - lib/puppet/feature/base.rb
427
347
  - lib/puppet/feature/bolt.rb
428
348
  - lib/puppet/feature/cfpropertylist.rb
@@ -456,6 +376,7 @@ files:
456
376
  - lib/puppet/file_serving/mount/modules.rb
457
377
  - lib/puppet/file_serving/mount/pluginfacts.rb
458
378
  - lib/puppet/file_serving/mount/plugins.rb
379
+ - lib/puppet/file_serving/mount/scripts.rb
459
380
  - lib/puppet/file_serving/mount/tasks.rb
460
381
  - lib/puppet/file_serving/terminus_helper.rb
461
382
  - lib/puppet/file_serving/terminus_selector.rb
@@ -1425,8 +1346,16 @@ files:
1425
1346
  - spec/fixtures/faulty_face/puppet/face/syntax.rb
1426
1347
  - spec/fixtures/hiera.yaml
1427
1348
  - spec/fixtures/integration/application/agent/cached_deferred_catalog.json
1349
+ - spec/fixtures/integration/application/agent/lib/facter/agent_spec_role.rb
1428
1350
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
1429
1351
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
1352
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/Gemfile
1353
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/Rakefile
1354
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/lib/puppet/functions/l10n.rb
1355
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/config.yaml
1356
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/ja/puppet-l10n.po
1357
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/puppet-l10n.pot
1358
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/metadata.json
1430
1359
  - spec/fixtures/integration/node/environment/sitedir/00_a.pp
1431
1360
  - spec/fixtures/integration/node/environment/sitedir/01_b.pp
1432
1361
  - spec/fixtures/integration/node/environment/sitedir/03_empty.pp
@@ -1472,6 +1401,8 @@ files:
1472
1401
  - spec/fixtures/ssl/intermediate-crl.pem
1473
1402
  - spec/fixtures/ssl/intermediate.pem
1474
1403
  - spec/fixtures/ssl/netlock-arany-utf8.pem
1404
+ - spec/fixtures/ssl/oid-key.pem
1405
+ - spec/fixtures/ssl/oid.pem
1475
1406
  - spec/fixtures/ssl/pluto-key.pem
1476
1407
  - spec/fixtures/ssl/pluto.pem
1477
1408
  - spec/fixtures/ssl/request-key.pem
@@ -1482,6 +1413,7 @@ files:
1482
1413
  - spec/fixtures/ssl/signed.pem
1483
1414
  - spec/fixtures/ssl/tampered-cert.pem
1484
1415
  - spec/fixtures/ssl/tampered-csr.pem
1416
+ - spec/fixtures/ssl/trusted_oid_mapping.yaml
1485
1417
  - spec/fixtures/ssl/unknown-127.0.0.1-key.pem
1486
1418
  - spec/fixtures/ssl/unknown-127.0.0.1.pem
1487
1419
  - spec/fixtures/ssl/unknown-ca-key.pem
@@ -1831,6 +1763,8 @@ files:
1831
1763
  - spec/integration/application/lookup_spec.rb
1832
1764
  - spec/integration/application/module_spec.rb
1833
1765
  - spec/integration/application/plugin_spec.rb
1766
+ - spec/integration/application/resource_spec.rb
1767
+ - spec/integration/application/ssl_spec.rb
1834
1768
  - spec/integration/configurer_spec.rb
1835
1769
  - spec/integration/data_binding_spec.rb
1836
1770
  - spec/integration/defaults_spec.rb
@@ -1845,6 +1779,7 @@ files:
1845
1779
  - spec/integration/indirector/facts/facter_spec.rb
1846
1780
  - spec/integration/indirector/file_content/file_server_spec.rb
1847
1781
  - spec/integration/indirector/file_metadata/file_server_spec.rb
1782
+ - spec/integration/l10n/compiler_spec.rb
1848
1783
  - spec/integration/network/authconfig_spec.rb
1849
1784
  - spec/integration/network/formats_spec.rb
1850
1785
  - spec/integration/network/http/api/indirected_routes_spec.rb
@@ -1941,6 +1876,7 @@ files:
1941
1876
  - spec/shared_contexts/checksum.rb
1942
1877
  - spec/shared_contexts/digests.rb
1943
1878
  - spec/shared_contexts/https.rb
1879
+ - spec/shared_contexts/l10n.rb
1944
1880
  - spec/shared_contexts/types_setup.rb
1945
1881
  - spec/shared_examples/rhel_package_provider.rb
1946
1882
  - spec/spec_helper.rb
@@ -2004,6 +1940,7 @@ files:
2004
1940
  - spec/unit/face/plugin_spec.rb
2005
1941
  - spec/unit/face/status_spec.rb
2006
1942
  - spec/unit/face_spec.rb
1943
+ - spec/unit/facter_impl_spec.rb
2007
1944
  - spec/unit/file_bucket/dipper_spec.rb
2008
1945
  - spec/unit/file_bucket/file_spec.rb
2009
1946
  - spec/unit/file_serving/base_spec.rb
@@ -2018,6 +1955,7 @@ files:
2018
1955
  - spec/unit/file_serving/mount/modules_spec.rb
2019
1956
  - spec/unit/file_serving/mount/pluginfacts_spec.rb
2020
1957
  - spec/unit/file_serving/mount/plugins_spec.rb
1958
+ - spec/unit/file_serving/mount/scripts_spec.rb
2021
1959
  - spec/unit/file_serving/mount/tasks_spec.rb
2022
1960
  - spec/unit/file_serving/mount_spec.rb
2023
1961
  - spec/unit/file_serving/terminus_helper_spec.rb
@@ -2189,7 +2127,6 @@ files:
2189
2127
  - spec/unit/indirector/ssl_file_spec.rb
2190
2128
  - spec/unit/indirector/status/local_spec.rb
2191
2129
  - spec/unit/indirector/status/rest_spec.rb
2192
- - spec/unit/indirector/store_configs_spec.rb
2193
2130
  - spec/unit/indirector/terminus_spec.rb
2194
2131
  - spec/unit/indirector/yaml_spec.rb
2195
2132
  - spec/unit/indirector_spec.rb
@@ -2664,7 +2601,8 @@ files:
2664
2601
  - tasks/parser.rake
2665
2602
  - tasks/yard.rake
2666
2603
  homepage: https://github.com/puppetlabs/puppet
2667
- licenses: []
2604
+ licenses:
2605
+ - Apache-2.0
2668
2606
  metadata: {}
2669
2607
  post_install_message:
2670
2608
  rdoc_options:
@@ -2694,8 +2632,16 @@ test_files:
2694
2632
  - spec/fixtures/faulty_face/puppet/face/syntax.rb
2695
2633
  - spec/fixtures/hiera.yaml
2696
2634
  - spec/fixtures/integration/application/agent/cached_deferred_catalog.json
2635
+ - spec/fixtures/integration/application/agent/lib/facter/agent_spec_role.rb
2697
2636
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
2698
2637
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
2638
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/Gemfile
2639
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/Rakefile
2640
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/lib/puppet/functions/l10n.rb
2641
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/config.yaml
2642
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/ja/puppet-l10n.po
2643
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/puppet-l10n.pot
2644
+ - spec/fixtures/integration/l10n/envs/prod/modules/demo/metadata.json
2699
2645
  - spec/fixtures/integration/node/environment/sitedir/00_a.pp
2700
2646
  - spec/fixtures/integration/node/environment/sitedir/01_b.pp
2701
2647
  - spec/fixtures/integration/node/environment/sitedir/03_empty.pp
@@ -2741,6 +2687,8 @@ test_files:
2741
2687
  - spec/fixtures/ssl/intermediate-crl.pem
2742
2688
  - spec/fixtures/ssl/intermediate.pem
2743
2689
  - spec/fixtures/ssl/netlock-arany-utf8.pem
2690
+ - spec/fixtures/ssl/oid-key.pem
2691
+ - spec/fixtures/ssl/oid.pem
2744
2692
  - spec/fixtures/ssl/pluto-key.pem
2745
2693
  - spec/fixtures/ssl/pluto.pem
2746
2694
  - spec/fixtures/ssl/request-key.pem
@@ -2751,6 +2699,7 @@ test_files:
2751
2699
  - spec/fixtures/ssl/signed.pem
2752
2700
  - spec/fixtures/ssl/tampered-cert.pem
2753
2701
  - spec/fixtures/ssl/tampered-csr.pem
2702
+ - spec/fixtures/ssl/trusted_oid_mapping.yaml
2754
2703
  - spec/fixtures/ssl/unknown-127.0.0.1-key.pem
2755
2704
  - spec/fixtures/ssl/unknown-127.0.0.1.pem
2756
2705
  - spec/fixtures/ssl/unknown-ca-key.pem
@@ -3100,6 +3049,8 @@ test_files:
3100
3049
  - spec/integration/application/lookup_spec.rb
3101
3050
  - spec/integration/application/module_spec.rb
3102
3051
  - spec/integration/application/plugin_spec.rb
3052
+ - spec/integration/application/resource_spec.rb
3053
+ - spec/integration/application/ssl_spec.rb
3103
3054
  - spec/integration/configurer_spec.rb
3104
3055
  - spec/integration/data_binding_spec.rb
3105
3056
  - spec/integration/defaults_spec.rb
@@ -3114,6 +3065,7 @@ test_files:
3114
3065
  - spec/integration/indirector/facts/facter_spec.rb
3115
3066
  - spec/integration/indirector/file_content/file_server_spec.rb
3116
3067
  - spec/integration/indirector/file_metadata/file_server_spec.rb
3068
+ - spec/integration/l10n/compiler_spec.rb
3117
3069
  - spec/integration/network/authconfig_spec.rb
3118
3070
  - spec/integration/network/formats_spec.rb
3119
3071
  - spec/integration/network/http/api/indirected_routes_spec.rb
@@ -3210,6 +3162,7 @@ test_files:
3210
3162
  - spec/shared_contexts/checksum.rb
3211
3163
  - spec/shared_contexts/digests.rb
3212
3164
  - spec/shared_contexts/https.rb
3165
+ - spec/shared_contexts/l10n.rb
3213
3166
  - spec/shared_contexts/types_setup.rb
3214
3167
  - spec/shared_examples/rhel_package_provider.rb
3215
3168
  - spec/spec_helper.rb
@@ -3273,6 +3226,7 @@ test_files:
3273
3226
  - spec/unit/face/plugin_spec.rb
3274
3227
  - spec/unit/face/status_spec.rb
3275
3228
  - spec/unit/face_spec.rb
3229
+ - spec/unit/facter_impl_spec.rb
3276
3230
  - spec/unit/file_bucket/dipper_spec.rb
3277
3231
  - spec/unit/file_bucket/file_spec.rb
3278
3232
  - spec/unit/file_serving/base_spec.rb
@@ -3287,6 +3241,7 @@ test_files:
3287
3241
  - spec/unit/file_serving/mount/modules_spec.rb
3288
3242
  - spec/unit/file_serving/mount/pluginfacts_spec.rb
3289
3243
  - spec/unit/file_serving/mount/plugins_spec.rb
3244
+ - spec/unit/file_serving/mount/scripts_spec.rb
3290
3245
  - spec/unit/file_serving/mount/tasks_spec.rb
3291
3246
  - spec/unit/file_serving/mount_spec.rb
3292
3247
  - spec/unit/file_serving/terminus_helper_spec.rb
@@ -3458,7 +3413,6 @@ test_files:
3458
3413
  - spec/unit/indirector/ssl_file_spec.rb
3459
3414
  - spec/unit/indirector/status/local_spec.rb
3460
3415
  - spec/unit/indirector/status/rest_spec.rb
3461
- - spec/unit/indirector/store_configs_spec.rb
3462
3416
  - spec/unit/indirector/terminus_spec.rb
3463
3417
  - spec/unit/indirector/yaml_spec.rb
3464
3418
  - spec/unit/indirector_spec.rb
@@ -1,8 +0,0 @@
1
- This is an example environment directory. The environment's modules can be
2
- placed in a "modules" subdirectory. The environments initial manifests are
3
- placed in a "manifests" subdirectory. By default the environment also has any
4
- modules that are installed globally (normally in /etc/puppetlabs/code/modules) for the
5
- puppet master.
6
-
7
- For more information see
8
- https://puppet.com/docs/puppet/latest/environments_about.html
data/ext/dbfix.sql DELETED
@@ -1,132 +0,0 @@
1
- -- MySQL DB consistency check/fix
2
- --
3
- -- Usage:
4
- -- cat dbfix.sql | mysql -u user -p puppet
5
- --
6
- -- WARNING: perform a database backup before running this script
7
-
8
- -- Remove duplicate resources, and keep the latest one
9
- DELETE bad_rows.*
10
- FROM resources AS bad_rows
11
- INNER JOIN (
12
- SELECT title,restype,host_id, MAX(id) as max_id
13
- FROM resources
14
- GROUP BY title,restype,host_id
15
- HAVING count(*) > 1
16
- ) AS good_rows
17
- ON
18
- good_rows.title = bad_rows.title AND
19
- good_rows.restype = bad_rows.restype AND
20
- good_rows.host_id = bad_rows.host_id AND
21
- good_rows.max_id <> bad_rows.id;
22
-
23
- -- Remove duplicate param_values, and keep the latest one
24
- DELETE bad_rows.*
25
- FROM param_values AS bad_rows
26
- INNER JOIN (
27
- SELECT value,param_name_id,resource_id, MAX(id) as max_id
28
- FROM param_values
29
- GROUP BY value,param_name_id,resource_id
30
- HAVING count(*) > 1
31
- ) AS good_rows
32
- ON
33
- good_rows.value = bad_rows.value AND
34
- good_rows.param_name_id = bad_rows.param_name_id AND
35
- good_rows.resource_id = bad_rows.resource_id AND
36
- good_rows.max_id <> bad_rows.id;
37
-
38
- -- rewrite param_values that points to duplicated param_names
39
- -- to point to the highest param_name id.
40
- UPDATE
41
- param_values v
42
- INNER JOIN
43
- param_names n
44
- ON n.id = v.param_name_id
45
- INNER JOIN
46
- (
47
- SELECT name, MAX(id) as max_id
48
- FROM param_names
49
- GROUP BY name
50
- HAVING count(*) > 1
51
- ) nmax ON n.name = nmax.name
52
- SET
53
- v.param_name_id = nmax.max_id;
54
-
55
- -- Remove duplicate param_names, and keep the latest one
56
- DELETE bad_rows.*
57
- FROM param_names AS bad_rows
58
- INNER JOIN (
59
- SELECT name, MAX(id) as max_id
60
- FROM param_names
61
- GROUP BY name
62
- HAVING count(*) > 1
63
- ) AS good_rows
64
- ON
65
- good_rows.name = bad_rows.name AND
66
- good_rows.max_id <> bad_rows.id;
67
-
68
- -- Remove duplicate resource_tags, and keep the highest one
69
- DELETE bad_rows.*
70
- FROM resource_tags AS bad_rows
71
- INNER JOIN (
72
- SELECT resource_id,puppet_tag_id, MAX(id) as max_id
73
- FROM resource_tags
74
- GROUP BY resource_id,puppet_tag_id
75
- HAVING count(*) > 1
76
- ) AS good_rows
77
- ON
78
- good_rows.resource_id = bad_rows.resource_id AND
79
- good_rows.puppet_tag_id = bad_rows.puppet_tag_id AND
80
- good_rows.max_id <> bad_rows.id;
81
-
82
- -- rewrite resource_tags that points to duplicated puppet_tags
83
- -- to point to the highest puppet_tags id.
84
- UPDATE
85
- resource_tags v
86
- INNER JOIN
87
- puppet_tags n
88
- ON n.id = v.puppet_tag_id
89
- INNER JOIN
90
- (
91
- SELECT name, MAX(id) as max_id
92
- FROM puppet_tags
93
- GROUP BY name
94
- HAVING count(*) > 1
95
- ) nmax ON n.name = nmax.name
96
- SET
97
- v.puppet_tag_id = nmax.max_id;
98
-
99
- -- Remove duplicate puppet_tags, and keep the highest one
100
- DELETE bad_rows.*
101
- FROM puppet_tags AS bad_rows
102
- INNER JOIN (
103
- SELECT name, MAX(id) as max_id
104
- FROM puppet_tags
105
- GROUP BY name
106
- HAVING count(*) > 1
107
- ) AS good_rows
108
- ON
109
- good_rows.name = bad_rows.name AND
110
- good_rows.max_id <> bad_rows.id;
111
-
112
- -- Fix dangling resources
113
- -- note: we use a table to not exceed the number of InnoDB locks if there are two much
114
- -- rows to delete.
115
- -- this is an alternative to: DELETE resources FROM resources r LEFT JOIN hosts h ON h.id=r.host_id WHERE h.id IS NULL;
116
- --
117
- CREATE TABLE resources_c LIKE resources;
118
- INSERT INTO resources_c SELECT r.* FROM resources r INNER JOIN hosts h ON h.id=r.host_id;
119
- RENAME TABLE resources TO resources_old, resources_c TO resources;
120
- DROP TABLE resources_old;
121
-
122
- -- Fix dangling param_values
123
- CREATE TABLE param_values_c LIKE param_values;
124
- INSERT INTO param_values_c SELECT v.* FROM param_values v INNER JOIN resources r ON r.id=v.resource_id;
125
- RENAME TABLE param_values TO param_values_old, param_values_c TO param_values;
126
- DROP TABLE param_values_old;
127
-
128
- -- Fix dangling resource_tags
129
- CREATE TABLE resource_tags_c LIKE resource_tags;
130
- INSERT INTO resource_tags_c SELECT t.* FROM resource_tags t INNER JOIN resources r ON r.id=t.resource_id;
131
- RENAME TABLE resource_tags TO resource_tags_old, resource_tags_c TO resource_tags;
132
- DROP TABLE resource_tags_old;
@@ -1,8 +0,0 @@
1
- puppet for Debian
2
- ------------------
3
-
4
- The default puppet configuration in Debian will automatically integrate with
5
- etckeeper if etckeeper is installed. puppet will automatically commit any
6
- changes made to files in /etc via etckeeper before and after its run.
7
-
8
- -- Mathias Gug <mathiaz@ubuntu.com> Wed, 18 Aug 2010 15:06:06 -0400
@@ -1,2 +0,0 @@
1
- The debian directory is now maintained on Alioth in git.
2
- See https://pkg-puppet.alioth.debian.org/ for more information.
@@ -1 +0,0 @@
1
- * clean up initscripts per http://mail.madstop.com/pipermail/puppet-dev/2006-June/001069.html