Merge branch 'master' into master

saz · web-flow · commit ca294beca19d · 2025-01-17T17:03:41.000+01:00
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,5 +1,6 @@
+---
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
---format documentation
---color
+skip-changelog:
+ - head-branch: ['^release-*', 'release']
diff --git a/.github/release.yml b/.github/release.yml
@@ -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:
+        - "*"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,6 +4,7 @@
 
 name: CI
 
+# yamllint disable-line rule:truthy
 on:
   pull_request: {}
   push:
@@ -18,4 +19,4 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2
+    uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v3
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -0,0 +1,18 @@
+---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+name: "Pull Request Labeler"
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request_target: {}
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,6 +4,7 @@
 
 name: Release
 
+# yamllint disable-line rule:truthy
 on:
   push:
     tags:
@@ -12,11 +13,18 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
     with:
       allowed_owner: 'saz'
     secrets:
       # Configure secrets here:
       #  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
diff --git 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.5.0'
+modulesync_config_version: '9.3.0'
diff --git a/.overcommit.yml b/.overcommit.yml
@@ -43,10 +43,12 @@ PreCommit:
     enabled: true
     description: 'Runs rubocop on modified files only'
     command: ['bundle', 'exec', 'rubocop']
-  PuppetLint:
+  RakeTarget:
     enabled: true
-    description: 'Runs puppet-lint on modified files only'
-    command: ['bundle', 'exec', 'puppet-lint']
+    description: 'Runs lint on modified files only'
+    targets:
+      - 'lint'
+    command: ['bundle', 'exec', 'rake']
   YamlSyntax:
     enabled: true
   JsonSyntax:
diff --git a/.pmtignore b/.pmtignore
@@ -20,6 +20,7 @@
 /.github/
 /.librarian/
 /Puppetfile.lock
+/Puppetfile
 *.iml
 /.editorconfig
 /.fixtures.yml
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
@@ -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
diff --git a/.rspec_parallel b/.rspec_parallel
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 7.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
@@ -26,7 +26,7 @@ end
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"]
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -242,7 +242,7 @@
   }
 
   $debian_legacy_location = '/etc/default/locale'
-  if $facts['os']['name'] == 'Debian' and $default_file != $debian_legacy_location {
+  if $facts['os']['family'] == 'Debian' and $default_file != $debian_legacy_location {
     file { $debian_legacy_location:
       ensure => $ensure,
       target => $default_file,
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -33,22 +33,11 @@
             $default_file = '/etc/default/locale'
           }
           $package     = 'locales'
-          case $facts['os']['distro']['codename'] {
-            'hardy': {
-              $update_locale_pkg = 'belocs-locales-bin'
-            }
-            default: {
-              $update_locale_pkg = 'libc-bin'
-            }
-          }
-          if versioncmp($facts['os']['release']['full'], '16.04') >= 0 {
-            $config_file = '/etc/locale.gen'
-          } else {
-            $config_file = '/var/lib/locales/supported.d/local'
-          }
+          $update_locale_pkg = 'libc-bin'
+          $config_file = '/etc/locale.gen'
         }
         /(Debian|Raspbian|Kali|Parrot)/: {
-          if versioncmp($facts['os']['release']['major'], '12') == 1 {
+          if versioncmp($facts['os']['release']['major'], '12') >= 0 {
             $default_file = '/etc/locale.conf'
           } else {
             $default_file = '/etc/default/locale'
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -20,7 +20,7 @@
         when 'debian'
           case facts[:os]['name'].downcase
           when 'debian'
-            default_file = if Gem::Version.new(facts[:os]['release']['major']) > Gem::Version.new('12')
+            default_file = if Gem::Version.new(facts[:os]['release']['major']) >= Gem::Version.new('12')
                              '/etc/locale.conf'
                            else
                              '/etc/default/locale'
@@ -38,22 +38,22 @@
           default_file = '/etc/locale.conf'
         end
 
-        it do
-          is_expected.to contain_file(default_file).with(
-            'ensure' => 'present',
-            'owner' => 'root',
-            'group' => 0,
-            'mode' => '0644'
-          )
-        end
-
         if os =~ (%r{^(debian|ubuntu)}) && (default_file != '/etc/default/locale')
           it do
-            is_expected.to contain_file(default_file).with(
+            is_expected.to contain_file('/etc/default/locale').with(
               'ensure' => 'present',
               'target' => '/etc/locale.conf'
             )
           end
+        else
+          it do
+            is_expected.to contain_file(default_file).with(
+              'ensure' => 'present',
+              'owner' => 'root',
+              'group' => 0,
+              'mode' => '0644'
+            )
+          end
         end
       end
     end
diff --git a/spec/spec.opts b/spec/spec.opts
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -9,6 +9,10 @@
 
 require 'voxpupuli/test/spec_helper'
 
+RSpec.configure do |c|
+  c.facterdb_string_keys = false
+end
+
 add_mocked_facts!
 
 if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
