From 15024e3c82751d8184e4c1276f57e7f0ddf29a0a Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 15 Apr 2017 18:04:27 +0300
Subject: Generate requested locales; fix conditions for hostname

---
 roles/sane_debian_system/defaults/main.yml |  5 +++++
 roles/sane_debian_system/tasks/env.yml     | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'roles')

diff --git a/roles/sane_debian_system/defaults/main.yml b/roles/sane_debian_system/defaults/main.yml
index 4554e5f..1e298e8 100644
--- a/roles/sane_debian_system/defaults/main.yml
+++ b/roles/sane_debian_system/defaults/main.yml
@@ -16,3 +16,8 @@ debian_mirror: ftp.fi.debian.org
 # dict with the key "repo", which is the sources.list line to add. If
 # list is empty (as it is by default), nothing extra is added.
 sources_lists: []
+
+
+# Locales that should be generated. This should be a list of name, such as
+# fi_FI.UTF-8.
+locales: []
diff --git a/roles/sane_debian_system/tasks/env.yml b/roles/sane_debian_system/tasks/env.yml
index d1e7cab..88e882c 100644
--- a/roles/sane_debian_system/tasks/env.yml
+++ b/roles/sane_debian_system/tasks/env.yml
@@ -2,18 +2,25 @@
   copy:
     content: "{{ hostname }}"
     dest: /etc/hostname
-  when: hostname
+  when: hostname is defined
 
 - name: add hostname to /etc/hosts
   lineinfile:
     dest: /etc/hosts
     regexp: '^127\.0\.1\.1 '
     line: "127.0.1.1 {{ hostname }}"
-  when: hostname
+  when: hostname is defined
 
 - name: install environment packages
   apt:
     name: "{{ item }}"
+    state: present
   with_items:
-    - locales-all
+    - locales
     - ntp
+
+- name: generate locales
+  locale_gen:
+    name: "{{ item }}"
+    state: present
+  with_items: "{{ locales }}"
-- 
cgit v1.2.1