summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-04-15 18:04:27 +0300
committerLars Wirzenius <liw@liw.fi>2017-04-15 18:04:27 +0300
commit15024e3c82751d8184e4c1276f57e7f0ddf29a0a (patch)
treedd9cd77b6216266361e2a9a7b419247c96a1602a /roles
parent04287d0576aefb8f41a3eca8a5b7439ed56364e9 (diff)
downloaddebian-ansible-15024e3c82751d8184e4c1276f57e7f0ddf29a0a.tar.gz
Generate requested locales; fix conditions for hostname
Diffstat (limited to 'roles')
-rw-r--r--roles/sane_debian_system/defaults/main.yml5
-rw-r--r--roles/sane_debian_system/tasks/env.yml13
2 files changed, 15 insertions, 3 deletions
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 }}"