Merge branch 'master' into deb12

.github/CONTRIBUTING.md

@@ -131,19 +131,29 @@ You can install all needed gems for spec tests into the modules directory by
 running:
 
 ```sh
-bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
+bundle config set --local path '.vendor/'
+bundle config set --local without 'development system_tests release'
+bundle install --jobs "$(nproc)"
 ```
 
 If you also want to run acceptance tests:
 
 ```sh
-bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
+bundle config set --local path '.vendor/'
+bundle config set --local without 'development release'
+bundle config set --local with 'system_tests'
+bundle install --jobs "$(nproc)"
 ```
 
 Our all in one solution if you don't know if you need to install or update gems:
 
 ```sh
-bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
+bundle config set --local path '.vendor/'
+bundle config set --local without 'development release'
+bundle config set --local with 'system_tests'
+bundle install --jobs "$(nproc)"
+bundle update
+bundle clean
 ```
 
 As an alternative to the `--jobs "$(nproc)` parameter, you can set an

.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 }}
@@ -13,6 +18,6 @@ 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'

.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:

.gitignore

@@ -21,3 +21,5 @@
 .*.sw?
 /.yardoc/
 /Guardfile
+bolt-debug.log
+.rerun.json

.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.5.0'

.pmtignore

@@ -35,3 +35,4 @@
 /.yardoc/
 /.yardopts
 /Dockerfile
+/HISTORY.md

.rubocop.yml

@@ -1,8 +1,7 @@
 ---
-inherit_from: .rubocop_todo.yml
-
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
+inherit_from: .rubocop_todo.yml
 inherit_gem:
   voxpupuli-test: rubocop.yml

CHANGELOG.md

@@ -4,6 +4,43 @@ 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.
 
+## [v10.0.0](https://github.com/voxpupuli/puppet-redis/tree/v10.0.0) (2024-02-16)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-redis/compare/v9.3.0...v10.0.0)
+
+**Breaking changes:**
+
+- remove legacy Debian 10 / Ubuntu 18.04 / CentOS 7 [\#504](https://github.com/voxpupuli/puppet-redis/pull/504) ([rwaffen](https://github.com/rwaffen))
+
+**Implemented enhancements:**
+
+- Add Ubuntu 22.04 [\#505](https://github.com/voxpupuli/puppet-redis/pull/505) ([rwaffen](https://github.com/rwaffen))
+- Implement rudimentary Redis and Sentinel ACLs [\#502](https://github.com/voxpupuli/puppet-redis/pull/502) ([TwizzyDizzy](https://github.com/TwizzyDizzy))
+
+**Merged pull requests:**
+
+- Remove legacy top-scope syntax [\#498](https://github.com/voxpupuli/puppet-redis/pull/498) ([smortex](https://github.com/smortex))
+
+## [v9.3.0](https://github.com/voxpupuli/puppet-redis/tree/v9.3.0) (2023-11-14)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-redis/compare/v9.2.0...v9.3.0)
+
+**Implemented enhancements:**
+
+- Add Puppet 8 support [\#484](https://github.com/voxpupuli/puppet-redis/pull/484) ([bastelfreak](https://github.com/bastelfreak))
+
+## [v9.2.0](https://github.com/voxpupuli/puppet-redis/tree/v9.2.0) (2023-11-03)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-redis/compare/v9.1.0...v9.2.0)
+
+**Implemented enhancements:**
+
+- Allow puppet/systemd 6.x [\#490](https://github.com/voxpupuli/puppet-redis/pull/490) ([evgeni](https://github.com/evgeni))
+
+**Merged pull requests:**
+
+- fix spelling of "redis dnf module" [\#491](https://github.com/voxpupuli/puppet-redis/pull/491) ([evgeni](https://github.com/evgeni))
+
 ## [v9.1.0](https://github.com/voxpupuli/puppet-redis/tree/v9.1.0) (2023-07-29)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-redis/compare/v9.0.0...v9.1.0)

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 'redis',                      :require => false
   gem 'mock_redis',                 :require => false
 end
@@ -18,13 +18,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

README.md

@@ -1,7 +1,7 @@
 # Puppet Redis
 
 [![License](https://img.shields.io/github/license/voxpupuli/puppet-redis.svg)](https://github.com/voxpupuli/puppet-redis/blob/master/LICENSE)
-[![Build Status](https://travis-ci.org/voxpupuli/puppet-redis.png?branch=master)](https://travis-ci.org/voxpupuli/puppet-redis)
+[![CI](https://github.com/voxpupuli/puppet-redis/actions/workflows/ci.yml/badge.svg)](https://github.com/voxpupuli/puppet-redis/actions/workflows/ci.yml)
 [![Code Coverage](https://coveralls.io/repos/github/voxpupuli/puppet-redis/badge.svg?branch=master)](https://coveralls.io/github/voxpupuli/puppet-redis)
 [![Puppet Forge](https://img.shields.io/puppetforge/v/puppet/redis.svg)](https://forge.puppetlabs.com/puppet/redis)
 [![Puppet Forge - downloads](https://img.shields.io/puppetforge/dt/puppet/redis.svg)](https://forge.puppetlabs.com/puppet/redis)
@@ -13,21 +13,21 @@
 ### Standalone
 
 ```puppet
-include ::redis
+include redis
 ```
 
 ### Master node
 
 ```puppet
-class { '::redis':
+class { 'redis':
   bind => '10.0.1.1',
 }
 ```
 
 With authentication
 
 ```puppet
-class { '::redis':
+class { 'redis':
   bind       => '10.0.1.1',
   masterauth => 'secret',
 }
@@ -36,7 +36,7 @@ class { '::redis':
 ### Slave node
 
 ```puppet
-class { '::redis':
+class { 'redis':
   bind    => '10.0.1.2',
   slaveof => '10.0.1.1 6379',
 }
@@ -45,7 +45,7 @@ class { '::redis':
 With authentication
 
 ```puppet
-class { '::redis':
+class { 'redis':
   bind       => '10.0.1.2',
   slaveof    => '10.0.1.1 6379',
   masterauth => 'secret',
@@ -55,7 +55,7 @@ class { '::redis':
 ### Redis 3.0 Clustering
 
 ```puppet
-class { '::redis':
+class { 'redis':
   bind                 => '10.0.1.2',
   appendonly           => true,
   cluster_enabled      => true,
@@ -70,7 +70,7 @@ class { '::redis':
 ```puppet
 $listening_ports = [6379,6380,6381,6382]
 
-class { '::redis':
+class { 'redis':
   default_install => false,
   service_enable  => false,
   service_ensure  => 'stopped',
@@ -97,21 +97,21 @@ Disabled by default but if you really want the module to manage the required
 repositories you can use this snippet:
 
 ```puppet
-class { '::redis':
+class { 'redis':
   manage_repo => true,
 }
 ```
 
 On Ubuntu, you can use a PPA by using the `ppa_repo` parameter:
 
 ```puppet
-class { '::redis':
+class { 'redis':
   manage_repo => true,
   ppa_repo    => 'ppa:rwky/redis',
 }
 ```
 
-**Warning** note that PPA usage requires [puppetlabs/apt](https://forge.puppet.com/puppetlabs/apt) on Ubuntu distros. On EL7 [puppet/epel](https://forge.puppet.com/puppet/epel) is needed unless the installation is using Software Collections. In that case will install `centos-release-scl-rh` from CentOS extras. For RHEL or other RHEL-derivatives this isn't managed.
+**Warning** note that PPA usage requires [puppetlabs/apt](https://forge.puppet.com/puppetlabs/apt) on Ubuntu distros
 
 ### Redis Sentinel
 
@@ -120,13 +120,13 @@ Optionally install and configuration a redis-sentinel server.
 With default settings:
 
 ```puppet
-include ::redis::sentinel
+include redis::sentinel
 ```
 
 With adjustments:
 
 ```puppet
-class { '::redis::sentinel':
+class { 'redis::sentinel':
   master_name      => 'cow',
   redis_host       => '192.168.1.5',
   failover_timeout => 30000,
@@ -135,7 +135,7 @@ class { '::redis::sentinel':
 
 ### Soft dependency
 
-When managing the repo, it either needs [puppetlabs/apt](https://forge.puppet.com/puppetlabs/apt) or [puppet/epel](https://forge.puppet.com/puppet/epel).
+When managing the repo, it needs [puppetlabs/apt](https://forge.puppet.com/puppetlabs/apt).
 
 For administration of sysctl it depends on [herculesteam/augeasproviders_sysctl](https://forge.puppet.com/herculesteam/augeasproviders_sysctl).