Merge branch 'master' into master

.github/workflows/ci.yml

@@ -19,12 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: 'geerlingguy.redis'
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -41,17 +41,18 @@ jobs:
     strategy:
       matrix:
         distro:
-          - rockylinux8
-          - ubuntu2004
+          - ubuntu2404
+          - debian12
+          - rockylinux9
 
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: 'geerlingguy.redis'
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

.github/workflows/release.yml

@@ -22,12 +22,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: 'geerlingguy.redis'
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

README.md

@@ -1,6 +1,6 @@
 # Ansible Role: Redis
 
-[![CI](https://github.com/geerlingguy/ansible-role-redis/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-redis/actions?query=workflow%3ACI)
+[![CI](https://github.com/geerlingguy/ansible-role-php-redis/actions/workflows/ci.yml/badge.svg)](https://github.com/geerlingguy/ansible-role-php-redis/actions/workflows/ci.yml)
 
 Installs [Redis](http://redis.io/) on Linux.
 

molecule/default/molecule.yml

@@ -2,11 +2,13 @@
 role_name_check: 1
 dependency:
   name: galaxy
+  options:
+    ignore-errors: true
 driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux9}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw

tasks/main.yml

@@ -12,7 +12,7 @@
   file:
     path: "{{ redis_conf_path | dirname }}"
     state: directory
-    mode: 0755
+    mode: "{{ redis_conf_dir_mode }}"
 
 - name: Ensure Redis is configured.
   template:

vars/Debian.yml

@@ -2,5 +2,6 @@
 __redis_package: redis-server
 redis_daemon: redis-server
 redis_pidfile: /var/run/redis/{{ redis_daemon }}.pid
+redis_conf_dir_mode: 02770
 redis_conf_path: /etc/redis/redis.conf
 redis_conf_mode: 0640

vars/RedHat.yml

@@ -3,4 +3,6 @@ __redis_package: redis
 redis_daemon: redis
 redis_pidfile: /var/run/redis/{{ redis_daemon }}.pid
 redis_conf_path: /etc/redis.conf
+redis_conf_dir_mode: 0750
+redis_conf_path: /etc/redis/redis.conf
 redis_conf_mode: 0644