From b36cafca1a1448aff1be29eaa80bdfdc938c1ad4 Mon Sep 17 00:00:00 2001 From: uumas Date: Fri, 8 Nov 2024 01:48:40 +0200 Subject: [PATCH] locale: lint --- roles/locale/defaults/{main.yml => main.yaml} | 2 ++ roles/locale/tasks/{main.yml => main.yaml} | 5 ++--- roles/locale/vars/{Archlinux.yml => Archlinux.yaml} | 1 - roles/locale/vars/{Debian.yml => Debian.yaml} | 1 - roles/locale/vars/{RedHat.yml => RedHat.yaml} | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) rename roles/locale/defaults/{main.yml => main.yaml} (76%) rename roles/locale/tasks/{main.yml => main.yaml} (86%) rename roles/locale/vars/{Archlinux.yml => Archlinux.yaml} (97%) rename roles/locale/vars/{Debian.yml => Debian.yaml} (98%) rename roles/locale/vars/{RedHat.yml => RedHat.yaml} (98%) diff --git a/roles/locale/defaults/main.yml b/roles/locale/defaults/main.yaml similarity index 76% rename from roles/locale/defaults/main.yml rename to roles/locale/defaults/main.yaml index 0a36146..14f530f 100644 --- a/roles/locale/defaults/main.yml +++ b/roles/locale/defaults/main.yaml @@ -1,4 +1,6 @@ --- +locale_package: [] +locale_gen: true gen_locales: - en_US.UTF-8 diff --git a/roles/locale/tasks/main.yml b/roles/locale/tasks/main.yaml similarity index 86% rename from roles/locale/tasks/main.yml rename to roles/locale/tasks/main.yaml index f09d3f4..4be134e 100644 --- a/roles/locale/tasks/main.yml +++ b/roles/locale/tasks/main.yaml @@ -1,18 +1,17 @@ --- - - name: Include variables for os family {{ ansible_os_family }} ansible.builtin.include_vars: "{{ ansible_os_family }}.yml" - name: Install locales package ansible.builtin.package: name: "{{ locale_package }}" - when: locale_package is defined + when: locale_package | length > 0 - name: Generate locales community.general.locale_gen: name: "{{ item }}" loop: "{{ gen_locales }}" - when: locale_gen | default('true') + when: locale_gen - name: Put default locale config in place ansible.builtin.template: diff --git a/roles/locale/vars/Archlinux.yml b/roles/locale/vars/Archlinux.yaml similarity index 97% rename from roles/locale/vars/Archlinux.yml rename to roles/locale/vars/Archlinux.yaml index 92d5ee4..1f18767 100644 --- a/roles/locale/vars/Archlinux.yml +++ b/roles/locale/vars/Archlinux.yaml @@ -1,3 +1,2 @@ --- - locale_config: /etc/locale.conf diff --git a/roles/locale/vars/Debian.yml b/roles/locale/vars/Debian.yaml similarity index 98% rename from roles/locale/vars/Debian.yml rename to roles/locale/vars/Debian.yaml index be72499..02aa050 100644 --- a/roles/locale/vars/Debian.yml +++ b/roles/locale/vars/Debian.yaml @@ -1,4 +1,3 @@ --- - locale_package: locales locale_config: /etc/default/locale diff --git a/roles/locale/vars/RedHat.yml b/roles/locale/vars/RedHat.yaml similarity index 98% rename from roles/locale/vars/RedHat.yml rename to roles/locale/vars/RedHat.yaml index dc71b31..ac32a3f 100644 --- a/roles/locale/vars/RedHat.yml +++ b/roles/locale/vars/RedHat.yaml @@ -1,4 +1,3 @@ --- - locale_config: /etc/locale.conf locale_gen: false