From f3b3d3cb82ef6f96d6d96be3412e66ca9bf01226 Mon Sep 17 00:00:00 2001 From: Bryan Joshua Pedini Date: Mon, 5 Jan 2026 23:11:28 +0100 Subject: [PATCH] chore(ansible): standardize distribution checks and quote consistency --- debian-to-pve.yml | 6 +++--- motd.yml | 4 ++-- personal-linux-config.yml | 8 ++++---- sshbanner-bjphoster.yml | 4 ++-- sshd-config.yml | 4 ++-- tasks/debian-docker/compose-v2.yml | 2 +- tasks/debian-docker/dependencies.yml | 2 +- tasks/debian-docker/docker.yml | 2 +- tasks/debian-docker/repository.yml | 2 +- upgrade-debian.yml | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/debian-to-pve.yml b/debian-to-pve.yml index 05808cc..6db2b4d 100644 --- a/debian-to-pve.yml +++ b/debian-to-pve.yml @@ -8,10 +8,10 @@ - import_tasks: tasks/debian-general/hostname.yml - import_tasks: tasks/debian-general/hosts-file.yml - import_tasks: tasks/debian-general/repositories-bullseye.yml - when: ansible_facts.lsb.codename == "bullseye" + when: ansible_facts["lsb"]["codename"] == "bullseye" - import_tasks: tasks/debian-general/repositories-bookworm.yml - when: ansible_facts.lsb.codename == "bookworm" + when: ansible_facts["lsb"]["codename"] == "bookworm" - import_tasks: tasks/debian-general/repositories-trixie.yml - when: ansible_facts.lsb.codename == "trixie" + when: ansible_facts["lsb"]["codename"] == "trixie" - import_tasks: tasks/debian-to-pve/repositories.yml - import_tasks: tasks/debian-to-pve/pve-server.yml diff --git a/motd.yml b/motd.yml index 2d7ff02..a2407d9 100644 --- a/motd.yml +++ b/motd.yml @@ -6,7 +6,7 @@ ansible.builtin.include_vars: file: figlet.yml - import_tasks: tasks/debian-general/update.yml - when: ansible_facts['distribution'] == 'Debian' + when: ansible_facts["distribution"] == "Debian" - import_tasks: tasks/rhel-general/update.yml - when: ansible_facts['distribution'] == 'RedHat' + when: ansible_facts["distribution"] == "RedHat" - import_tasks: tasks/general/figlet.yml diff --git a/personal-linux-config.yml b/personal-linux-config.yml index 74f99d9..cbb9702 100644 --- a/personal-linux-config.yml +++ b/personal-linux-config.yml @@ -3,11 +3,11 @@ become: true tasks: - import_tasks: tasks/debian-general/git.yml - when: ansible_facts["os_family"] == "Debian" + when: ansible_facts["distribution"] == "Debian" - import_tasks: tasks/debian-general/hostname-package.yml - when: ansible_facts["os_family"] == "Debian" + when: ansible_facts["distribution"] == "Debian" - import_tasks: tasks/rhel-general/git.yml - when: ansible_facts["os_family"] == "RedHat" + when: ansible_facts["distribution"] == "RedHat" - import_tasks: tasks/rhel-general/hostname-package.yml - when: ansible_facts["os_family"] == "RedHat" + when: ansible_facts["distribution"] == "RedHat" - import_tasks: tasks/general/personal-linux-config.yml diff --git a/sshbanner-bjphoster.yml b/sshbanner-bjphoster.yml index 37ab4a0..c4d570f 100644 --- a/sshbanner-bjphoster.yml +++ b/sshbanner-bjphoster.yml @@ -4,6 +4,6 @@ tasks: - import_tasks: tasks/general/sshbanner-bjphoster.yml - import_tasks: tasks/debian-general/sshbanner.yml - when: ansible_facts["os_family"] == "Debian" + when: ansible_facts["distribution"] == "Debian" - import_tasks: tasks/rhel-general/sshbanner.yml - when: ansible_facts["os_family"] == "RedHat" + when: ansible_facts["distribution"] == "RedHat" diff --git a/sshd-config.yml b/sshd-config.yml index 36c6f67..d90b3b4 100644 --- a/sshd-config.yml +++ b/sshd-config.yml @@ -4,6 +4,6 @@ tasks: - import_tasks: tasks/general/sshd-config.yml - import_tasks: tasks/debian-general/restart-ssh-service.yml - when: ansible_facts["os_family"] == "Debian" + when: ansible_facts["distribution"] == "Debian" - import_tasks: tasks/rhel-general/restart-ssh-service.yml - when: ansible_facts["os_family"] == "RedHat" + when: ansible_facts["distribution"] == "RedHat" diff --git a/tasks/debian-docker/compose-v2.yml b/tasks/debian-docker/compose-v2.yml index 8eea76a..30d7ba3 100644 --- a/tasks/debian-docker/compose-v2.yml +++ b/tasks/debian-docker/compose-v2.yml @@ -5,4 +5,4 @@ name: - docker-compose-plugin state: latest - when: ansible_facts.os_family == "Debian" + when: ansible_facts["distribution"] == "Debian" diff --git a/tasks/debian-docker/dependencies.yml b/tasks/debian-docker/dependencies.yml index b722119..f2fa2d5 100644 --- a/tasks/debian-docker/dependencies.yml +++ b/tasks/debian-docker/dependencies.yml @@ -8,4 +8,4 @@ - curl - gnupg - lsb-release - when: ansible_facts.os_family == "Debian" + when: ansible_facts["distribution"] == "Debian" diff --git a/tasks/debian-docker/docker.yml b/tasks/debian-docker/docker.yml index 104607b..b998365 100644 --- a/tasks/debian-docker/docker.yml +++ b/tasks/debian-docker/docker.yml @@ -5,4 +5,4 @@ name: - docker-ce state: latest - when: ansible_facts.os_family == "Debian" + when: ansible_facts["distribution"] == "Debian" diff --git a/tasks/debian-docker/repository.yml b/tasks/debian-docker/repository.yml index a0e4b08..8c0a385 100644 --- a/tasks/debian-docker/repository.yml +++ b/tasks/debian-docker/repository.yml @@ -6,4 +6,4 @@ owner: root group: root mode: 0644 - when: ansible_facts.distribution == 'Debian' + when: ansible_facts["distribution"] == "Debian" diff --git a/upgrade-debian.yml b/upgrade-debian.yml index e2039e3..49f0930 100644 --- a/upgrade-debian.yml +++ b/upgrade-debian.yml @@ -7,5 +7,5 @@ - import_tasks: tasks/debian-general/repositories-bookworm.yml when: ansible_facts["lsb"]["codename"] == "bookworm" - import_tasks: tasks/debian-general/repositories-trixie.yml - when: ansible_facts.lsb.codename == "trixie" + when: ansible_facts["lsb"]["codename"] == "trixie" - import_tasks: tasks/debian-general/upgrade.yml