From 22402cffe0ddb53a76975e5a04587d22879a644c Mon Sep 17 00:00:00 2001 From: OSiUX Date: Thu, 2 Jan 2025 18:18:37 -0300 Subject: [PATCH 1/7] defaults/main: minor fixes suggested by ansible-lint @ 00:10 hs --- defaults/main.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 3b88d08..ac26853 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,10 +4,10 @@ redis_enablerepo: epel redis_port: 6379 redis_bind_interface: 127.0.0.1 -redis_unixsocket: '' +redis_unixsocket: "" redis_timeout: 300 -redis_loglevel: "notice" +redis_loglevel: notice redis_logfile: /var/log/redis/redis-server.log redis_databases: 16 @@ -23,15 +23,14 @@ redis_dbfilename: dump.rdb redis_dbdir: /var/lib/redis redis_maxmemory: 0 -redis_maxmemory_policy: "noeviction" +redis_maxmemory_policy: noeviction redis_maxmemory_samples: 5 redis_appendonly: "no" -redis_appendfsync: "everysec" +redis_appendfsync: everysec # Add extra include files for local configuration/overrides. redis_includes: [] - # Require authentication to Redis with a password. redis_requirepass: "" From 0dd0b2c86aed0762b362694a152c75159c851408 Mon Sep 17 00:00:00 2001 From: OSiUX Date: Thu, 2 Jan 2025 18:19:56 -0300 Subject: [PATCH 2/7] handlers/main: set FQCN for service @ 00:01 hs --- handlers/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index 9a21203..350858d 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,3 +1,3 @@ --- - name: restart redis - service: "name={{ redis_daemon }} state=restarted" + ansible.builtin.service: name={{ redis_daemon }} state=restarted From 9a13f5a78d5873ab8ebff88f7b9040e7a35f0e7c Mon Sep 17 00:00:00 2001 From: OSiUX Date: Thu, 2 Jan 2025 18:21:32 -0300 Subject: [PATCH 3/7] defaults/main: minor fixes suggested by ansible-lint and setting FQCN in tasks @ 00:10 hs --- tasks/main.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 03ee836..68838bd 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,35 +1,34 @@ --- # Variable setup. - name: Include OS-specific variables. - include_vars: "{{ ansible_os_family }}.yml" - + ansible.builtin.include_vars: "{{ ansible_os_family }}.yml" - name: Define redis_package. - set_fact: + ansible.builtin.set_fact: redis_package: "{{ __redis_package }}" when: redis_package is not defined - name: Ensure Redis configuration dir exists. - file: + ansible.builtin.file: path: "{{ redis_conf_path | dirname }}" state: directory mode: "{{ redis_conf_dir_mode }}" - name: Ensure Redis is configured. - template: + ansible.builtin.template: src: redis.conf.j2 dest: "{{ redis_conf_path }}" mode: "{{ redis_conf_mode }}" notify: restart redis # Setup/install tasks. -- include_tasks: setup-RedHat.yml +- ansible.builtin.include_tasks: setup-RedHat.yml when: ansible_os_family == 'RedHat' -- include_tasks: setup-Debian.yml +- ansible.builtin.include_tasks: setup-Debian.yml when: ansible_os_family == 'Debian' -- include_tasks: setup-Archlinux.yml +- ansible.builtin.include_tasks: setup-Archlinux.yml when: ansible_os_family == 'Archlinux' - name: Ensure Redis is running and enabled on boot. - service: "name={{ redis_daemon }} state=started enabled=yes" + ansible.builtin.service: name={{ redis_daemon }} state=started enabled=yes From 9ff58f9783c9f9e003bfec1e78d8df451363c998 Mon Sep 17 00:00:00 2001 From: OSiUX Date: Thu, 2 Jan 2025 18:23:09 -0300 Subject: [PATCH 4/7] tasks/setup-Archlinux: set FQCN for pacman @ 00:01 hs --- tasks/setup-Archlinux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/setup-Archlinux.yml b/tasks/setup-Archlinux.yml index d75d0e5..2a0e046 100644 --- a/tasks/setup-Archlinux.yml +++ b/tasks/setup-Archlinux.yml @@ -1,5 +1,5 @@ --- - name: Ensure Redis is installed. - pacman: + community.general.pacman: name: "{{ redis_package }}" state: present From c9ba53cfb5d6820a5ccea968179e01009a93df6b Mon Sep 17 00:00:00 2001 From: OSiUX Date: Thu, 2 Jan 2025 18:26:07 -0300 Subject: [PATCH 5/7] tasks/setup-Debian: set FQCN for apt @ 00:01 hs --- tasks/setup-Debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 41f17f9..35dfb6e 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -1,5 +1,5 @@ --- - name: Ensure Redis is installed. - apt: + ansible.builtin.apt: name: "{{ redis_package }}" state: present From ee6ff0176aae0bde25def424de5739942e20d981 Mon Sep 17 00:00:00 2001 From: OSiUX Date: Thu, 2 Jan 2025 18:26:25 -0300 Subject: [PATCH 6/7] vars/Debian: minor fixes suggested by ansible-lint and setting FQCN in tasks @ 00:05 hs --- vars/Debian.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/Debian.yml b/vars/Debian.yml index f1a05c1..34a85da 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,6 +1,6 @@ --- __redis_package: redis-server redis_daemon: redis-server -redis_conf_dir_mode: 02770 +redis_conf_dir_mode: "02770" redis_conf_path: /etc/redis/redis.conf -redis_conf_mode: 0640 +redis_conf_mode: "0640" From 17c5ea788f32864a142931925f9bdb42de6d8f15 Mon Sep 17 00:00:00 2001 From: OSiUX Date: Thu, 2 Jan 2025 18:26:59 -0300 Subject: [PATCH 7/7] vars/RedHat: minor fixes suggested by ansible-lint and setting FQCN in tasks @ 00:05 hs --- vars/RedHat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/RedHat.yml b/vars/RedHat.yml index f400573..5987261 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -1,6 +1,6 @@ --- __redis_package: redis redis_daemon: redis -redis_conf_dir_mode: 0750 +redis_conf_dir_mode: "0750" redis_conf_path: /etc/redis/redis.conf -redis_conf_mode: 0644 +redis_conf_mode: "0644"