From 660c404aebc0f7df4c6bc5484e793847012a9495 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 20 Dec 2022 14:34:34 +0100 Subject: [PATCH 01/18] modulesync 5.4.0 --- .msync.yml | 2 +- Gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.msync.yml b/.msync.yml index 0235385..f3156d1 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '5.3.0' +modulesync_config_version: '5.4.0' diff --git a/Gemfile b/Gemfile index 93b549b..592a8a7 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :test do gem 'voxpupuli-test', '~> 5.4', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 1.0', :require => false + gem 'puppet_metadata', '~> 2.0', :require => false gem 'ruby-augeas', :require => false end From b8eb6bc4998796c69a78380da4f0bf98d06e2e42 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 6 Jan 2023 09:07:31 +0100 Subject: [PATCH 02/18] Fix License detection --- LICENSE | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 197 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index eca33eb..261eeb9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,16 +1,201 @@ -augeasproviders: alternative Augeas-based providers for Puppet + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Copyright (c) 2012-2016 Dominic Cleal and Raphaël Pinson -Copyright (c) 2017-2020 Raphaël Pinson + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 1. Definitions. -http://www.apache.org/licenses/LICENSE-2.0 + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From c0b5271a9f47da9e624af79e2af4a925eb680146 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 6 Jan 2023 09:26:10 +0100 Subject: [PATCH 03/18] Fix incorrect Apache-2 license --- LICENSE | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 197 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index eca33eb..261eeb9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,16 +1,201 @@ -augeasproviders: alternative Augeas-based providers for Puppet + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Copyright (c) 2012-2016 Dominic Cleal and Raphaël Pinson -Copyright (c) 2017-2020 Raphaël Pinson + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 1. Definitions. -http://www.apache.org/licenses/LICENSE-2.0 + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 38d68297ea5fad8e7030ed0a1cf268d2de9d448f Mon Sep 17 00:00:00 2001 From: Massimiliano Adamo Date: Sat, 15 Apr 2023 09:51:20 +0200 Subject: [PATCH 04/18] modulesync 5.5.0 --- .github/SECURITY.md | 3 --- .gitignore | 36 ++++++++++++------------- .msync.yml | 2 +- .pmtignore | 64 ++++++++++++++++++++++----------------------- Gemfile | 3 +-- Rakefile | 36 +++---------------------- 6 files changed, 56 insertions(+), 88 deletions(-) delete mode 100644 .github/SECURITY.md diff --git a/.github/SECURITY.md b/.github/SECURITY.md deleted file mode 100644 index cacadf2..0000000 --- a/.github/SECURITY.md +++ /dev/null @@ -1,3 +0,0 @@ -# Vox Pupuli Security Policy - -Our vulnerabilities reporting process is at https://voxpupuli.org/security/ diff --git a/.gitignore b/.gitignore index 9b95224..84fd904 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,23 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -pkg/ -Gemfile.lock -Gemfile.local -vendor/ -.vendor/ -spec/fixtures/manifests/ -spec/fixtures/modules/ -.vagrant/ -.bundle/ -.ruby-version -coverage/ -log/ -.idea/ -.dependencies/ -.librarian/ -Puppetfile.lock +/pkg/ +/Gemfile.lock +/Gemfile.local +/vendor/ +/.vendor/ +/spec/fixtures/manifests/ +/spec/fixtures/modules/ +/.vagrant/ +/.bundle/ +/.ruby-version +/coverage/ +/log/ +/.idea/ +/.dependencies/ +/.librarian/ +/Puppetfile.lock *.iml .*.sw? -.yardoc/ -Guardfile +/.yardoc/ +/Guardfile diff --git a/.msync.yml b/.msync.yml index f3156d1..a4b0069 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '5.4.0' +modulesync_config_version: '5.5.0' diff --git a/.pmtignore b/.pmtignore index 65f5051..58a0408 100644 --- a/.pmtignore +++ b/.pmtignore @@ -1,37 +1,37 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -docs/ -pkg/ -Gemfile -Gemfile.lock -Gemfile.local -vendor/ -.vendor/ -spec/ -Rakefile -.vagrant/ -.bundle/ -.ruby-version -coverage/ -log/ -.idea/ -.dependencies/ -.github/ -.librarian/ -Puppetfile.lock +/docs/ +/pkg/ +/Gemfile +/Gemfile.lock +/Gemfile.local +/vendor/ +/.vendor/ +/spec/ +/Rakefile +/.vagrant/ +/.bundle/ +/.ruby-version +/coverage/ +/log/ +/.idea/ +/.dependencies/ +/.github/ +/.librarian/ +/Puppetfile.lock *.iml -.editorconfig -.fixtures.yml -.gitignore -.msync.yml -.overcommit.yml -.pmtignore -.rspec -.rspec_parallel -.rubocop.yml -.sync.yml +/.editorconfig +/.fixtures.yml +/.gitignore +/.msync.yml +/.overcommit.yml +/.pmtignore +/.rspec +/.rspec_parallel +/.rubocop.yml +/.sync.yml .*.sw? -.yardoc/ -.yardopts -Dockerfile +/.yardoc/ +/.yardopts +/Dockerfile diff --git a/Gemfile b/Gemfile index 592a8a7..85c9a67 100644 --- a/Gemfile +++ b/Gemfile @@ -24,8 +24,7 @@ end group :release do gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5' - gem 'voxpupuli-release', '>= 1.2.0', :require => false - gem 'puppet-strings', '>= 2.2', :require => false + gem 'voxpupuli-release', '~> 2.0', :require => false end gem 'rake', :require => false diff --git a/Rakefile b/Rakefile index c2f4c94..0542d9c 100644 --- a/Rakefile +++ b/Rakefile @@ -24,6 +24,10 @@ end begin require 'voxpupuli/release/rake_tasks' rescue LoadError + # voxpupuli-release not present +else + GCGConfig.user = 'voxpupuli' + GCGConfig.project = 'puppet-augeasproviders_ssh' end desc "Run main 'test' task and report merged results to coveralls" @@ -37,36 +41,4 @@ task test_with_coveralls: [:test] do end end -desc 'Generate REFERENCE.md' -task :reference, [:debug, :backtrace] do |t, args| - patterns = '' - Rake::Task['strings:generate:reference'].invoke(patterns, args[:debug], args[:backtrace]) -end - -begin - require 'github_changelog_generator/task' - require 'puppet_blacksmith' - GitHubChangelogGenerator::RakeTask.new :changelog do |config| - metadata = Blacksmith::Modulefile.new - config.future_release = "v#{metadata.version}" if metadata.version =~ /^\d+\.\d+.\d+$/ - config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module." - config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog} - config.user = 'voxpupuli' - config.project = 'puppet-augeasproviders_ssh' - end - - # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715 - require 'rbconfig' - if RbConfig::CONFIG['host_os'] =~ /linux/ - task :changelog do - puts 'Fixing line endings...' - changelog_file = File.join(__dir__, 'CHANGELOG.md') - changelog_txt = File.read(changelog_file) - new_contents = changelog_txt.gsub(%r{\r\n}, "\n") - File.open(changelog_file, "w") {|file| file.puts new_contents } - end - end - -rescue LoadError -end # vim: syntax=ruby From 906665bbf5d3f6e8cffb65966ac21a51081d494a Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 17 Apr 2023 11:09:39 +0200 Subject: [PATCH 05/18] Regenerate REFERENCE.md --- REFERENCE.md | 80 ++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index b9046d6..63420d0 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -53,33 +53,33 @@ All other parameters take a string. When passing an array to other parameters, o The following parameters are available in the `ssh_config` type. -* [`host`](#host) -* [`key`](#key) -* [`name`](#name) -* [`provider`](#provider) -* [`target`](#target) +* [`host`](#-ssh_config--host) +* [`key`](#-ssh_config--key) +* [`name`](#-ssh_config--name) +* [`provider`](#-ssh_config--provider) +* [`target`](#-ssh_config--target) -##### `host` +##### `host` Host condition for the entry. -##### `key` +##### `key` Overrides setting name to prevent resource conflicts if `host` is given. -##### `name` +##### `name` namevar The name of the setting, or a unique string if `host` given. -##### `provider` +##### `provider` The specific backend to use for this `ssh_config` resource. You will seldom need to specify this --- Puppet will usually discover the appropriate provider for your platform. -##### `target` +##### `target` The file in which to store the settings, defaults to `/etc/ssh/ssh_config`. @@ -133,22 +133,22 @@ All other parameters take a string. When passing an array to other parameters, o The following parameters are available in the `sshd_config` type. -* [`array_append`](#array_append) -* [`condition`](#condition) -* [`key`](#key) -* [`name`](#name) -* [`provider`](#provider) -* [`target`](#target) +* [`array_append`](#-sshd_config--array_append) +* [`condition`](#-sshd_config--condition) +* [`key`](#-sshd_config--key) +* [`name`](#-sshd_config--name) +* [`provider`](#-sshd_config--provider) +* [`target`](#-sshd_config--target) -##### `array_append` +##### `array_append` -Valid values: ``false``, ``true`` +Valid values: `false`, `true` Whether to add to existing array values or replace all values. -Default value: ``false`` +Default value: `false` -##### `condition` +##### `condition` Match group condition for the entry, in the format: @@ -163,23 +163,23 @@ whitespace. This is used if the `Match` block has multiple criteria. condition => 'Host example.net User root' -##### `key` +##### `key` Overrides setting name to prevent resource conflicts if `condition` is given. -##### `name` +##### `name` namevar The name of the setting, or a unique string if `condition` given. -##### `provider` +##### `provider` The specific backend to use for this `sshd_config` resource. You will seldom need to specify this --- Puppet will usually discover the appropriate provider for your platform. -##### `target` +##### `target` The file in which to store the settings, defaults to `/etc/ssh/sshd_config`. @@ -210,32 +210,32 @@ Default value: `present` The following parameters are available in the `sshd_config_match` type. -* [`condition`](#condition) -* [`name`](#name) -* [`position`](#position) -* [`provider`](#provider) -* [`target`](#target) +* [`condition`](#-sshd_config_match--condition) +* [`name`](#-sshd_config_match--name) +* [`position`](#-sshd_config_match--position) +* [`provider`](#-sshd_config_match--provider) +* [`target`](#-sshd_config_match--target) -##### `condition` +##### `condition` namevar The condition of the Match group -##### `name` +##### `name` The default namevar -##### `position` +##### `position` Where to place the new entry -##### `provider` +##### `provider` The specific backend to use for this `sshd_config_match` resource. You will seldom need to specify this --- Puppet will usually discover the appropriate provider for your platform. -##### `target` +##### `target` namevar @@ -271,22 +271,22 @@ Default value: `present` The following parameters are available in the `sshd_config_subsystem` type. -* [`name`](#name) -* [`provider`](#provider) -* [`target`](#target) +* [`name`](#-sshd_config_subsystem--name) +* [`provider`](#-sshd_config_subsystem--provider) +* [`target`](#-sshd_config_subsystem--target) -##### `name` +##### `name` namevar The name of the subsystem to set. -##### `provider` +##### `provider` The specific backend to use for this `sshd_config_subsystem` resource. You will seldom need to specify this --- Puppet will usually discover the appropriate provider for your platform. -##### `target` +##### `target` The file in which to store the settings, defaults to `/etc/ssh/sshd_config`. From c6d8ebba48867331f2ba16726c5e985d2a6379f8 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 17 Apr 2023 11:16:31 +0200 Subject: [PATCH 06/18] Add Rocky 9 support --- metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 7d79c60..76a722e 100644 --- a/metadata.json +++ b/metadata.json @@ -48,7 +48,8 @@ { "operatingsystem": "Rocky", "operatingsystemrelease": [ - "8" + "8", + "9" ] }, { From 62d4d696d81ea5b025d7b5b10cec0a9e7e57f304 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 28 Apr 2023 13:44:08 +0200 Subject: [PATCH 07/18] Drop Puppet 6 support --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 76a722e..fcce26b 100644 --- a/metadata.json +++ b/metadata.json @@ -77,7 +77,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.1.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 8.0.0" } ] } From 6c07abb52d75f6c3ce5c838a37d628c50bccff63 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 12 May 2023 10:55:45 +0200 Subject: [PATCH 08/18] modulesync 6.0.0 --- .msync.yml | 2 +- Gemfile | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.msync.yml b/.msync.yml index a4b0069..b929160 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '5.5.0' +modulesync_config_version: '6.0.0' diff --git a/Gemfile b/Gemfile index 85c9a67..4b27863 100644 --- a/Gemfile +++ b/Gemfile @@ -4,10 +4,10 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 5.4', :require => false + gem 'voxpupuli-test', '~> 6.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 2.0', :require => false + gem 'puppet_metadata', '~> 3.0', :require => false gem 'ruby-augeas', :require => false end @@ -17,20 +17,21 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 1.0', :require => false + gem 'voxpupuli-acceptance', '~> 2.0', :require => false gem 'simp-beaker-helpers', '~> 1.24', :require => false gem 'puppetlabs_spec_helper', :require => false end group :release do - gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5' - gem 'voxpupuli-release', '~> 2.0', :require => false + gem 'github_changelog_generator', '>= 1.16.1', :require => false + gem 'voxpupuli-release', '~> 3.0', :require => false + gem 'faraday-retry', '~> 2.1', :require => false end gem 'rake', :require => false gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test] -puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0' +puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24' gem 'puppet', puppetversion, :require => false, :groups => [:test] # vim: syntax=ruby From b94d537e5c8ad0a6701885bf3faa52153c0dc87d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 12 May 2023 13:09:22 +0200 Subject: [PATCH 09/18] cleanup gemfile --- .sync.yml | 4 ---- Gemfile | 1 - 2 files changed, 5 deletions(-) diff --git a/.sync.yml b/.sync.yml index 4dea700..8640b2d 100644 --- a/.sync.yml +++ b/.sync.yml @@ -5,10 +5,6 @@ Gemfile: optional: ':test': - gem: ruby-augeas - ':system_tests': - - gem: 'simp-beaker-helpers' - version: '~> 1.24' - - gem: 'puppetlabs_spec_helper' spec/spec_helper.rb: spec_overrides: - "require 'augeas_spec'" diff --git a/Gemfile b/Gemfile index 4b27863..cc5a9c9 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,6 @@ end group :system_tests do gem 'voxpupuli-acceptance', '~> 2.0', :require => false - gem 'simp-beaker-helpers', '~> 1.24', :require => false gem 'puppetlabs_spec_helper', :require => false end From 63c01bc369c22ef6eb55148b2e12990f9e4170c2 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 22 Jun 2023 14:22:23 +0200 Subject: [PATCH 10/18] Add puppet 8 support --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index fcce26b..9acd67a 100644 --- a/metadata.json +++ b/metadata.json @@ -77,7 +77,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 7.0.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 9.0.0" } ] } From fbeae1249ca12798275c341923193cd1c5889132 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 22 Jun 2023 14:23:08 +0200 Subject: [PATCH 11/18] puppet/augeasproviders_core: Allow 4.x --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 9acd67a..689c0c7 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppet/augeasproviders_core", - "version_requirement": ">=3.2.0 <4.0.0" + "version_requirement": ">= 3.2.0 < 5.0.0" } ], "operatingsystem_support": [ From 8f99032d1b2cf8a702166692d1e7b4609031902f Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 22 Jun 2023 14:25:03 +0200 Subject: [PATCH 12/18] Release 6.0.0 --- CHANGELOG.md | 20 ++++++++++++++++++++ metadata.json | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a105d27..9b27a8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. +## [v6.0.0](https://github.com/voxpupuli/puppet-augeasproviders_ssh/tree/v6.0.0) (2023-06-22) + +[Full Changelog](https://github.com/voxpupuli/puppet-augeasproviders_ssh/compare/v5.0.0...v6.0.0) + +**Breaking changes:** + +- Drop Puppet 6 support [\#88](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/88) ([bastelfreak](https://github.com/bastelfreak)) + +**Implemented enhancements:** + +- puppet/augeasproviders\_core: Allow 4.x [\#91](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/91) ([bastelfreak](https://github.com/bastelfreak)) +- Add puppet 8 support [\#90](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/90) ([bastelfreak](https://github.com/bastelfreak)) +- Add Rocky 9 support [\#87](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/87) ([bastelfreak](https://github.com/bastelfreak)) +- Add support of PubkeyAcceptedKeyTypes for ssh\_config [\#81](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/81) ([hbenali](https://github.com/hbenali)) + +**Merged pull requests:** + +- Fix incorrect Apache-2 license [\#85](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/85) ([bastelfreak](https://github.com/bastelfreak)) +- Fix License detection [\#84](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/84) ([bastelfreak](https://github.com/bastelfreak)) + ## [v5.0.0](https://github.com/voxpupuli/puppet-augeasproviders_ssh/tree/v5.0.0) (2022-08-30) [Full Changelog](https://github.com/voxpupuli/puppet-augeasproviders_ssh/compare/4.0.0...v5.0.0) diff --git a/metadata.json b/metadata.json index 689c0c7..461bdbd 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-augeasproviders_ssh", - "version": "5.0.1-rc0", + "version": "6.0.0", "author": "Vox Pupuli", "summary": "Augeas-based ssh types and providers for Puppet", "license": "Apache-2.0", From a2ae9a41ebca3bf42408dd1120b2704a995229af Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 22 Jun 2023 14:25:41 +0200 Subject: [PATCH 13/18] [blacksmith] Bump version to 6.0.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 461bdbd..64a6016 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-augeasproviders_ssh", - "version": "6.0.0", + "version": "6.0.1-rc0", "author": "Vox Pupuli", "summary": "Augeas-based ssh types and providers for Puppet", "license": "Apache-2.0", From 1ee323553c7cb3078ee273ed6f69adbcfcc10fbd Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 17 Aug 2023 14:32:44 +0200 Subject: [PATCH 14/18] modulesync 7.0.0 --- .github/CONTRIBUTING.md | 11 +++++++---- .msync.yml | 2 +- Gemfile | 3 +-- spec/spec_helper.rb | 1 + spec/spec_helper_acceptance.rb | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8b466cf..6aaa603 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this with: ```sh -BEAKER_setfile=debian11-64 bundle exec rake beaker +BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker ``` -You can replace the string `debian10` with any common operating system. +You can replace the string `debian11` with any common operating system. The following strings are known to work: -* ubuntu1804 * ubuntu2004 -* debian10 +* ubuntu2204 * debian11 * centos7 * centos8 +* centos9 +* almalinux8 +* almalinux9 +* fedora36 For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests). diff --git a/.msync.yml b/.msync.yml index b929160..dd3e957 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '6.0.0' +modulesync_config_version: '7.0.0' diff --git a/Gemfile b/Gemfile index cc5a9c9..7221ee1 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 6.0', :require => false + gem 'voxpupuli-test', '~> 7.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 3.0', :require => false @@ -18,7 +18,6 @@ end group :system_tests do gem 'voxpupuli-acceptance', '~> 2.0', :require => false - gem 'puppetlabs_spec_helper', :require => false end group :release do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 979fea8..4dcb3ca 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -27,3 +27,4 @@ $LOAD_PATH.unshift(File.join(__dir__, 'fixtures/modules/sshkeys_core/lib')) $LOAD_PATH.unshift(File.join(__dir__, 'fixtures/modules/augeasproviders_ssh/lib')) +Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f } diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index d3a6e23..2681792 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -5,6 +5,6 @@ require 'voxpupuli/acceptance/spec_helper_acceptance' -configure_beaker +configure_beaker(modules: :metadata) Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f } From dd91290417ca8c7d02ea507bc19a5a9e6a50bae0 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 17 Aug 2023 23:58:53 +0200 Subject: [PATCH 15/18] rubocop: autofix --- .rubocop_todo.yml | 17 +++++++++++------ lib/puppet/provider/ssh_config/augeas.rb | 2 +- lib/puppet/provider/sshd_config/augeas.rb | 2 +- lib/puppet/provider/sshkey/augeas.rb | 4 +--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index e3ead7a..5db81df 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2022-08-03 06:53:06 UTC using RuboCop version 1.22.3. +# on 2023-08-17 21:30:05 UTC using RuboCop version 1.50.2. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -13,6 +13,16 @@ Lint/ConstantDefinitionInBlock: Exclude: - 'lib/puppet/provider/sshd_config_match/augeas.rb' +# Offense count: 11 +# This cop supports unsafe autocorrection (--autocorrect-all). +RSpec/BeEq: + Exclude: + - 'spec/unit/puppet/provider/ssh_config/augeas_spec.rb' + - 'spec/unit/puppet/provider/sshd_config/augeas_spec.rb' + - 'spec/unit/puppet/provider/sshd_config_match/augeas_spec.rb' + - 'spec/unit/puppet/provider/sshd_config_subsystem/augeas_spec.rb' + - 'spec/unit/puppet/provider/sshkey/augeas_spec.rb' + # Offense count: 10 # Configuration parameters: AssignmentOnly. RSpec/InstanceVariable: @@ -44,8 +54,3 @@ Style/AsciiComments: - 'lib/puppet/type/sshd_config.rb' - 'lib/puppet/type/sshd_config_match.rb' - 'lib/puppet/type/sshd_config_subsystem.rb' - -# Offense count: 1 -Style/MixinUsage: - Exclude: - - 'spec/spec_helper_local.rb' diff --git a/lib/puppet/provider/ssh_config/augeas.rb b/lib/puppet/provider/ssh_config/augeas.rb index 093add8..6ba4589 100644 --- a/lib/puppet/provider/ssh_config/augeas.rb +++ b/lib/puppet/provider/ssh_config/augeas.rb @@ -103,7 +103,7 @@ def self.set_simple_value(aug, base, path, label, value) aug.insert(lastsp, label, false) else # Prefer to create the node next to a commented out entry - commented = aug.match("#{base}/#comment[.=~regexp('#{label}([^a-z\.].*)?')]") + commented = aug.match("#{base}/#comment[.=~regexp('#{label}([^a-z.].*)?')]") aug.insert(commented.first, label, false) unless commented.empty? end aug.set("#{path}[last()]", v) diff --git a/lib/puppet/provider/sshd_config/augeas.rb b/lib/puppet/provider/sshd_config/augeas.rb index 762788e..de3c2f9 100644 --- a/lib/puppet/provider/sshd_config/augeas.rb +++ b/lib/puppet/provider/sshd_config/augeas.rb @@ -94,7 +94,7 @@ def self.set_simple_value(aug, base, path, label, value) aug.insert(lastsp, label, false) else # Prefer to create the node next to a commented out entry - commented = aug.match("#{base}/#comment[.=~regexp('#{label}([^a-z\.].*)?', 'i')]") + commented = aug.match("#{base}/#comment[.=~regexp('#{label}([^a-z.].*)?', 'i')]") if commented.empty? if aug.match("#{base}/Match").empty? # insert as the last line diff --git a/lib/puppet/provider/sshkey/augeas.rb b/lib/puppet/provider/sshkey/augeas.rb index 67973ee..b46e89f 100644 --- a/lib/puppet/provider/sshkey/augeas.rb +++ b/lib/puppet/provider/sshkey/augeas.rb @@ -181,9 +181,7 @@ def host_aliases augopen do |aug| if resource_hashed?(aug) # We cannot know about unmanaged aliases when hashed - resource[:host_aliases].map do |a| - a if self.class.find_resource(aug, a) - end.compact + resource[:host_aliases].select { |a| self.class.find_resource(aug, a) } else aug.match('$resource/alias').map do |a| aug.get(a) From 1f08f23601f3dc8a2804042e5346b15f89d3465a Mon Sep 17 00:00:00 2001 From: herver Date: Sun, 3 Sep 2023 16:24:55 +0000 Subject: [PATCH 16/18] Update git:// URLs to use https:// This module still uses old git:// URLs, for consistency with other augeasproviders and also with https://github.blog/2021-09-01-improving-git-protocol-security-github/ it should use https:// --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 64d466a..ba1fb9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "augeas"] path = spec/fixtures/augeas - url = git://github.com/hercules-team/augeas.git + url = https://github.com/hercules-team/augeas.git From 631db700904052a83ae10ab3c60a9cb818f16675 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 15 Dec 2023 12:07:09 +0100 Subject: [PATCH 17/18] modulesync 7.2.0 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- .msync.yml | 2 +- .pmtignore | 1 + Gemfile | 8 +++----- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66c5428..43a4c2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1 + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 with: pidfile_workaround: 'false' additional_packages: 'libaugeas-dev augeas-tools' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 15f1721..55324aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: jobs: release: name: Release - uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1 + uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2 with: allowed_owner: 'voxpupuli' secrets: diff --git a/.msync.yml b/.msync.yml index dd3e957..f818344 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.0.0' +modulesync_config_version: '7.2.0' diff --git a/.pmtignore b/.pmtignore index 58a0408..10b9830 100644 --- a/.pmtignore +++ b/.pmtignore @@ -35,3 +35,4 @@ /.yardoc/ /.yardopts /Dockerfile +/HISTORY.md diff --git a/Gemfile b/Gemfile index 7221ee1..b61ba2a 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :test do gem 'voxpupuli-test', '~> 7.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 3.0', :require => false + gem 'puppet_metadata', '~> 3.5', :require => false gem 'ruby-augeas', :require => false end @@ -17,13 +17,11 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 2.0', :require => false + gem 'voxpupuli-acceptance', '~> 3.0', :require => false end group :release do - gem 'github_changelog_generator', '>= 1.16.1', :require => false - gem 'voxpupuli-release', '~> 3.0', :require => false - gem 'faraday-retry', '~> 2.1', :require => false + gem 'voxpupuli-release', '~> 3.0', :require => false end gem 'rake', :require => false From d6074e53abad0a8e39dafef40babf7028868130c Mon Sep 17 00:00:00 2001 From: markuszilch Date: Tue, 6 Feb 2024 12:23:56 +0100 Subject: [PATCH 18/18] modulesync 7.3.0 --- .github/workflows/ci.yml | 7 ++++++- .msync.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43a4c2c..60eba01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,12 @@ name: CI -on: pull_request +on: + pull_request: {} + push: + branches: + - main + - master concurrency: group: ${{ github.ref_name }} diff --git a/.msync.yml b/.msync.yml index f818344..f46ee02 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.2.0' +modulesync_config_version: '7.3.0'