From 4894f3fba9696d75be782223f1d3ce24341dc0fa Mon Sep 17 00:00:00 2001
From: dede <luca@g-laber.de>
Date: Sun, 7 Jan 2024 11:43:37 +0100
Subject: [PATCH] rename config_locale to set_locale

---
 roles/config_locale/defaults/main.yml         |  3 --
 roles/set_locale/defaults/main.yml            |  3 ++
 .../tasks/main.yml                            | 33 ++++++++++---------
 3 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 roles/config_locale/defaults/main.yml
 create mode 100644 roles/set_locale/defaults/main.yml
 rename roles/{config_locale => set_locale}/tasks/main.yml (57%)

diff --git a/roles/config_locale/defaults/main.yml b/roles/config_locale/defaults/main.yml
deleted file mode 100644
index 7127127..0000000
--- a/roles/config_locale/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-system_locale: 'de_DE.UTF-8'
-system_language: 'en_US.UTF-8'
diff --git a/roles/set_locale/defaults/main.yml b/roles/set_locale/defaults/main.yml
new file mode 100644
index 0000000..7861c03
--- /dev/null
+++ b/roles/set_locale/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+set_locale_locale: 'de_DE.UTF-8'
+set_locale_language: 'en_US.UTF-8'
diff --git a/roles/config_locale/tasks/main.yml b/roles/set_locale/tasks/main.yml
similarity index 57%
rename from roles/config_locale/tasks/main.yml
rename to roles/set_locale/tasks/main.yml
index f741853..7a9849b 100644
--- a/roles/config_locale/tasks/main.yml
+++ b/roles/set_locale/tasks/main.yml
@@ -2,36 +2,37 @@
 # got this from here:
 # https://serverfault.com/questions/959026/how-do-i-generate-and-set-the-locale-using-ansible/981742#981742
 
-- name: ensure locale files are available for {{ system_locale }}
+- name: ensure locale files are available for {{ set_locale_locale }}
   become: true
   community.general.locale_gen:
-    name: "{{ system_locale }}"
+    name: "{{ set_locale_locale }}"
     state: present
 
-- name: ensure locale files are available for {{ system_language }}
+- name: ensure locale files are available for {{ set_locale_language }}
   become: true
   community.general.locale_gen:
-    name: "{{ system_language }}"
+    name: "{{ set_locale_language }}"
     state: present
 
 - name: get current locale and language configuration
-  ansible.builtin.command:
-    cmd: localectl status
   register: locale_status
   changed_when: false
-
-- name: set locale to '{{ system_locale }}'
-  become: true
-  changed_when: locale_lang != system_locale
+  ignore_errors: true
   ansible.builtin.command:
-    cmd: localectl set-locale LANG={{ system_locale }}
+    cmd: localectl status
+
+- name: set locale to '{{ set_locale_locale }}'
+  become: true
+  changed_when: locale_lang != set_locale_locale
   vars:
     locale_lang: "{{ locale_status.stdout | regex_search('LANG=([^\n]+)', '\\1') | first }}"
-
-- name: set language to '{{ system_language }}'
-  become: true
-  changed_when: locale_language != system_language
   ansible.builtin.command:
-    cmd: localectl set-locale LANGUAGE={{ system_language }}
+    cmd: localectl set-locale LANG={{ set_locale_locale }}
+
+- name: set language to '{{ set_locale_language }}'
+  become: true
+  changed_when: locale_language != set_locale_language
   vars:
     locale_language: "{{ locale_status.stdout | regex_search('LANGUAGE=([^\n]+)', '\\1') | default([locale_lang], true) | first }}"
+  ansible.builtin.command:
+    cmd: localectl set-locale LANGUAGE={{ set_locale_language }}