From 50d10cad16a1eaa32c6571b384d6c53a6b1ed8a8 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 24 Jan 2024 22:01:07 -0600 Subject: [PATCH 1/9] Make local dev with molecule a little easier. --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- molecule/default/molecule.yml | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e49bd83..807fdf7 100644 --- a/.github/workflows/ci.yml +++ b/.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' @@ -46,12 +46,12 @@ jobs: 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' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 036a348..3f67bf2 100644 --- a/.github/workflows/release.yml +++ b/.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' diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index d291e5b..147da5d 100644 --- a/molecule/default/molecule.yml +++ b/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:-rockylinux8}-ansible:latest" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw From 02029c5ceee6719749a391cc3d95b59a90d6c439 Mon Sep 17 00:00:00 2001 From: chadek <32199566+chadek@users.noreply.github.com> Date: Mon, 12 Feb 2024 22:00:43 +0100 Subject: [PATCH 2/9] Update octal permission --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 0d57dc4..7ca3475 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -12,7 +12,7 @@ file: path: "{{ redis_conf_path | dirname }}" state: directory - mode: 0755 + mode: '0755' - name: Ensure Redis is configured. template: From be3635438a54de02e839e1eac2f69682067e0ca0 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 16 Jul 2024 14:23:28 -0500 Subject: [PATCH 3/9] Fixup CI versions. Drop all older RHEL releases which are broken. --- .github/workflows/ci.yml | 2 +- molecule/default/molecule.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 807fdf7..b009eea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: strategy: matrix: distro: - - rockylinux8 + - rockylinux9 - ubuntu2004 steps: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 147da5d..3c2f1e5 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -8,7 +8,7 @@ driver: name: docker platforms: - name: instance - image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux8}-ansible:latest" + image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux9}-ansible:latest" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw From 40650edc97c9a942b67053352f80029c99ac53c6 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 25 Jul 2024 21:48:55 -0500 Subject: [PATCH 4/9] Only test on Debian and Ubuntu, Rocky Linux idempotence failing. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b009eea..cab10a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,8 +41,8 @@ jobs: strategy: matrix: distro: - - rockylinux9 - - ubuntu2004 + - ubuntu2404 + - debian12 steps: - name: Check out the codebase. From 7288f2b0e38348584919dd028e6fd82ad6d20b88 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 25 Jul 2024 21:55:23 -0500 Subject: [PATCH 5/9] Add back rockylinux9. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cab10a5..4580c75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,6 +43,7 @@ jobs: distro: - ubuntu2404 - debian12 + - rockylinux9 steps: - name: Check out the codebase. From bd02efdc3ae5a83713ff0e8430c65ff80bcdb3c9 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 30 Jul 2024 23:59:35 -0500 Subject: [PATCH 6/9] Revert "[bug fix] Update octal permission syntax" --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 7ca3475..0d57dc4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -12,7 +12,7 @@ file: path: "{{ redis_conf_path | dirname }}" state: directory - mode: '0755' + mode: 0755 - name: Ensure Redis is configured. template: From a04b7b952076302dafc0a2d0aefbb20b58520637 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 31 Jul 2024 00:01:01 -0500 Subject: [PATCH 7/9] Update CI status badge. And nudge a build. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e8df670..142ba84 100644 --- a/README.md +++ b/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. From 400cf603fa56cc3bcdc2ec93110b469baad8407a Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 31 Jul 2024 00:21:37 -0500 Subject: [PATCH 8/9] Issue #84: Updated redis config path for newer Red Hat releases. --- tasks/main.yml | 2 +- vars/RedHat.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 0d57dc4..d18e5b2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -12,7 +12,7 @@ file: path: "{{ redis_conf_path | dirname }}" state: directory - mode: 0755 + mode: 0750 - name: Ensure Redis is configured. template: diff --git a/vars/RedHat.yml b/vars/RedHat.yml index a64d953..30b40a1 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -1,5 +1,5 @@ --- __redis_package: redis redis_daemon: redis -redis_conf_path: /etc/redis.conf +redis_conf_path: /etc/redis/redis.conf redis_conf_mode: 0644 From 7677f6af2388345897adcef9931b02a6f52d5c94 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 31 Jul 2024 00:39:57 -0500 Subject: [PATCH 9/9] Issue #84: Fix configuration directory mode. --- tasks/main.yml | 2 +- vars/Debian.yml | 1 + vars/RedHat.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index d18e5b2..03ee836 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -12,7 +12,7 @@ file: path: "{{ redis_conf_path | dirname }}" state: directory - mode: 0750 + mode: "{{ redis_conf_dir_mode }}" - name: Ensure Redis is configured. template: diff --git a/vars/Debian.yml b/vars/Debian.yml index 47aaa02..f1a05c1 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,5 +1,6 @@ --- __redis_package: redis-server redis_daemon: redis-server +redis_conf_dir_mode: 02770 redis_conf_path: /etc/redis/redis.conf redis_conf_mode: 0640 diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 30b40a1..f400573 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -1,5 +1,6 @@ --- __redis_package: redis redis_daemon: redis +redis_conf_dir_mode: 0750 redis_conf_path: /etc/redis/redis.conf redis_conf_mode: 0644