diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e49bd83..4580c75 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' @@ -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' 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/README.md b/README.md index 49943c2..d28ccb4 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. diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index d291e5b..3c2f1e5 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:-rockylinux9}-ansible:latest" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw diff --git a/tasks/main.yml b/tasks/main.yml index 86d382f..bb6604c 100644 --- a/tasks/main.yml +++ b/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: diff --git a/vars/Debian.yml b/vars/Debian.yml index a4b923a..6aec905 100644 --- a/vars/Debian.yml +++ b/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 diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 64bf213..b87db2a 100644 --- a/vars/RedHat.yml +++ b/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