From: Oleg Broytman <phd@phdru.name>
Date: Tue, 23 Jul 2019 23:28:03 +0000 (+0300)
Subject: Refactor(init-system): Merge locale handlers back into tasks
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=1aba98e48d7de45085bd03b9f2e58b404a732a42;p=ansible.git

Refactor(init-system): Merge locale handlers back into tasks
---

diff --git a/playbooks/debian/roles/init-system/handlers/main.yml b/playbooks/debian/roles/init-system/handlers/main.yml
deleted file mode 100644
index 701e789..0000000
--- a/playbooks/debian/roles/init-system/handlers/main.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- name: Configure locales
-  become: true
-  lineinfile:
-    path: /etc/locale.gen
-    regexp: "^{{ item }}"
-    line: "{{ item }}"
-  loop: [
-      'en_US ISO-8859-1',
-      'ru_RU.KOI8-R KOI8-R',
-      'ru_RU.UTF-8 UTF-8',
-  ]
-  notify: Regenerate locales
-
-- name: Regenerate locales
-  become: true
-  command: /usr/sbin/locale-gen
diff --git a/playbooks/debian/roles/init-system/tasks/locales.yml b/playbooks/debian/roles/init-system/tasks/locales.yml
index 77adf74..58b7aa7 100644
--- a/playbooks/debian/roles/init-system/tasks/locales.yml
+++ b/playbooks/debian/roles/init-system/tasks/locales.yml
@@ -3,11 +3,23 @@
   register: has_locales
 
 - debug:
-    msg: "Creating and regenerating locales..."
-  changed_when: true # Force notification
-  notify: Configure locales
+    msg: "Locales have already been configured"
+  when: has_locales.stdout != "0"
+
+- name: Configure locales
+  become: true
+  lineinfile:
+    path: /etc/locale.gen
+    regexp: "^{{ item }}"
+    line: "{{ item }}"
+  loop: [
+      'en_US ISO-8859-1',
+      'ru_RU.KOI8-R KOI8-R',
+      'ru_RU.UTF-8 UTF-8',
+  ]
   when: has_locales.stdout == "0"
 
-- debug:
-    msg: "Locales has already been created"
-  when: has_locales.stdout != "0"
+- name: Regenerate locales
+  become: true
+  command: /usr/sbin/locale-gen
+  when: has_locales.stdout == "0"