Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modulesync 9.1.0 #430

Merged
merged 2 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,23 @@ with:
BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
```

or

```sh
BEAKER_PUPPET_COLLECTION=none BEAKER_setfile=archlinux-64 bundle exec rake beaker
```

This latter example will use the distribution's own version of Puppet.

You can replace the string `debian11` with any common operating system.
The following strings are known to work:

* ubuntu2004
* ubuntu2204
* debian11
* centos7
* centos8
* debian12
* centos9
* archlinux
* almalinux8
* almalinux9
* fedora36
Expand Down
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

skip-changelog:
- head-branch: ['^release-*', 'release']
42 changes: 42 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes

changelog:
exclude:
labels:
- duplicate
- invalid
- modulesync
- question
- skip-changelog
- wont-fix
- wontfix

categories:
- title: Breaking Changes 🛠
labels:
- backwards-incompatible

- title: New Features 🎉
labels:
- enhancement

- title: Bug Fixes 🐛
labels:
- bug

- title: Documentation Updates 📚
labels:
- documentation
- docs

- title: Dependency Updates ⬆️
labels:
- dependencies

- title: Other Changes
labels:
- "*"
17 changes: 17 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

name: "Pull Request Labeler"

on:
pull_request_target: {}

jobs:
labeler:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v5
7 changes: 7 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,10 @@ jobs:
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
username: ${{ secrets.PUPPET_FORGE_USERNAME }}
api_key: ${{ secrets.PUPPET_FORGE_API_KEY }}

create-github-release:
name: Create GitHub Release
runs-on: ubuntu-latest
steps:
- name: Create GitHub release
uses: voxpupuli/gha-create-a-github-release@v1
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '9.0.0'
modulesync_config_version: '9.1.0'
3 changes: 3 additions & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

--fail-on-warnings
--no-parameter_documentation-check
--no-parameter_types-check
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 8.0', :require => false
gem 'voxpupuli-test', '~> 9.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 4.0', :require => false
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/openldap_access/olc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
provide(:olc, parent: Puppet::Provider::Openldap) do
# TODO: Use ruby bindings (can't find one that support IPC)

defaultfor osfamily: %i[debian freebsd redhat suse]
defaultfor 'os.family' => %i[debian freebsd redhat suse]

mk_resource_methods

Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/openldap_database/olc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
provide(:olc, parent: Puppet::Provider::Openldap) do
# TODO: Use ruby bindings (can't find one that support IPC)

defaultfor osfamily: %i[debian freebsd redhat suse]
defaultfor 'os.family' => %i[debian freebsd redhat suse]

mk_resource_methods

Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/openldap_dbindex/olc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
provide(:olc, parent: Puppet::Provider::Openldap) do
# TODO: Use ruby bindings (can't find one that support IPC)

defaultfor osfamily: %i[debian freebsd redhat suse]
defaultfor 'os.family' => %i[debian freebsd redhat suse]

mk_resource_methods

Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/openldap_global_conf/olc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
provide(:olc, parent: Puppet::Provider::Openldap) do
# TODO: Use ruby bindings (can't find one that support IPC)

defaultfor osfamily: %i[debian freebsd redhat suse]
defaultfor 'os.family' => %i[debian freebsd redhat suse]

mk_resource_methods

Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/openldap_module/olc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
provide(:olc, parent: Puppet::Provider::Openldap) do
# TODO: Use ruby bindings (can't find one that support IPC)

defaultfor osfamily: %i[debian freebsd redhat suse]
defaultfor 'os.family' => %i[debian freebsd redhat suse]

mk_resource_methods

Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/openldap_overlay/olc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
provide(:olc, parent: Puppet::Provider::Openldap) do
# TODO: Use ruby bindings (can't find one that support IPC)

defaultfor osfamily: %i[debian freebsd redhat suse]
defaultfor 'os.family' => %i[debian freebsd redhat suse]

mk_resource_methods

Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/openldap_schema/olc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
provide(:olc, parent: Puppet::Provider::Openldap) do
# TODO: Use ruby bindings (can't find one that support IPC)

defaultfor osfamily: %i[debian freebsd redhat suse]
defaultfor 'os.family' => %i[debian freebsd redhat suse]

mk_resource_methods

Expand Down
12 changes: 6 additions & 6 deletions lib/puppet/type/openldap_database.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
desc 'The name of the backend.'
newvalues('bdb', 'hdb', 'mdb', 'monitor', 'config', 'relay', 'ldap')
defaultto do
case Facter.value(:osfamily)
case Facter.value('os.family')
when 'Debian'
case Facter.value(:operatingsystem)
case Facter.value('os.name')
when 'Debian'
if Facter.value(:operatingsystemmajrelease).to_i <= 7
if Facter.value('os.release.major').to_i <= 7
'hdb'
else
'mdb'
end
when 'Ubuntu'
if Facter.value(:operatingsystemmajrelease).to_i <= 15
if Facter.value('os.release.major').to_i <= 15
'hdb'
else
'mdb'
Expand All @@ -48,9 +48,9 @@
'hdb'
end
when 'RedHat'
if Facter.value(:operatingsystemmajrelease).to_i <= 6
if Facter.value('os.release.major').to_i <= 6
'bdb'
elsif Facter.value(:os).dig('release', 'major').to_i >= 9
elsif Facter.value('os.release.major').to_i >= 9
'mdb'
else
'hdb'
Expand Down
Loading
Loading