Преглед изворни кода

Fix the way the default locale is set

Emmanuel Bouthenot пре 6 година
родитељ
комит
68b080398d
2 измењених фајлова са 6 додато и 6 уклоњено
  1. 0 3
      roles/common/handlers/base.yml
  2. 6 3
      roles/common/tasks/base.yml

+ 0 - 3
roles/common/handlers/base.yml

@@ -1,6 +1,3 @@
-- name: Reconfigure locales
-  command: dpkg-reconfigure --frontend noninteractive locales
-
 - name: Reconfigure timezone
   raw: rm -f /etc/timezone ; dpkg-reconfigure --frontend noninteractive tzdata
 

+ 6 - 3
roles/common/tasks/base.yml

@@ -87,14 +87,17 @@
   apt: pkg=ntp install_recommends=no state=present
   when: with_ntp
 
-- name: 'Configure default locale and timezone'
+- name: 'Configure default locale ({{ locale }})'
+  command: update-locale 'LANG={{ locale }}'
+  changed_when: False
+  when: locale is defined and locale != ''
+
+- name: 'Configure default timezone'
   debconf: name="{{item.name}}" question="{{item.question}}" value="{{item.value}}" vtype="{{item.vtype}}"
   with_items:
-    - { name: 'locales', question: 'locales/default_environment_locale', value: '{{ locale }}', vtype: 'select' }
     - { name: 'tzdata', question: 'tzdata/Areas', value: '{{ timezone_area }}', vtype: 'select' }
     - { name: 'tzdata', question: 'tzdata/Zones/{{ timezone_area }}', value: '{{ timezone_city }}', vtype: 'select' }
   notify:
-    - 'Reconfigure locales'
     - 'Reconfigure timezone'
 
 - name: 'Override logrotate configuration for rsyslog'