v0.2.2 fix locale_config variable names
This commit is contained in:
@@ -8,7 +8,7 @@ namespace: dede
|
|||||||
name: common
|
name: common
|
||||||
|
|
||||||
# The version of the collection. Must be compatible with semantic versioning
|
# The version of the collection. Must be compatible with semantic versioning
|
||||||
version: 0.2.1
|
version: 0.2.2
|
||||||
|
|
||||||
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
|
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
|
||||||
readme: README.md
|
readme: README.md
|
||||||
|
|||||||
@@ -2,17 +2,17 @@
|
|||||||
# got this from here:
|
# got this from here:
|
||||||
# https://serverfault.com/questions/959026/how-do-i-generate-and-set-the-locale-using-ansible/981742#981742
|
# https://serverfault.com/questions/959026/how-do-i-generate-and-set-the-locale-using-ansible/981742#981742
|
||||||
|
|
||||||
- name: ensure locale files are available for {{ set_locale_locale }}
|
- name: ensure locale files are available for {{ locale_config_locale }}
|
||||||
become: true
|
become: true
|
||||||
community.general.locale_gen:
|
community.general.locale_gen:
|
||||||
name: "{{ set_locale_locale }}"
|
|
||||||
state: present
|
state: present
|
||||||
|
name: "{{ locale_config_locale }}"
|
||||||
|
|
||||||
- name: ensure locale files are available for {{ set_locale_language }}
|
- name: ensure locale files are available for {{ locale_config_language }}
|
||||||
become: true
|
become: true
|
||||||
community.general.locale_gen:
|
community.general.locale_gen:
|
||||||
name: "{{ set_locale_language }}"
|
|
||||||
state: present
|
state: present
|
||||||
|
name: "{{ locale_config_language }}"
|
||||||
|
|
||||||
- name: get current locale and language configuration
|
- name: get current locale and language configuration
|
||||||
register: locale_status
|
register: locale_status
|
||||||
@@ -21,18 +21,18 @@
|
|||||||
ansible.builtin.command:
|
ansible.builtin.command:
|
||||||
cmd: localectl status
|
cmd: localectl status
|
||||||
|
|
||||||
- name: set locale to '{{ set_locale_locale }}'
|
- name: set locale to '{{ locale_config_locale }}'
|
||||||
become: true
|
become: true
|
||||||
changed_when: locale_lang != set_locale_locale
|
changed_when: locale_lang != locale_config_locale
|
||||||
vars:
|
vars:
|
||||||
locale_lang: "{{ locale_status.stdout | regex_search('LANG=([^\n]+)', '\\1') | first }}"
|
locale_lang: "{{ locale_status.stdout | regex_search('LANG=([^\n]+)', '\\1') | first }}"
|
||||||
ansible.builtin.command:
|
ansible.builtin.command:
|
||||||
cmd: localectl set-locale LANG={{ set_locale_locale }}
|
cmd: localectl set-locale LANG={{ locale_config_locale }}
|
||||||
|
|
||||||
- name: set language to '{{ set_locale_language }}'
|
- name: set language to '{{ locale_config_language }}'
|
||||||
become: true
|
become: true
|
||||||
changed_when: locale_language != set_locale_language
|
changed_when: locale_language != locale_config_language
|
||||||
vars:
|
vars:
|
||||||
locale_language: "{{ locale_status.stdout | regex_search('LANGUAGE=([^\n]+)', '\\1') | default([locale_lang], true) | first }}"
|
locale_language: "{{ locale_status.stdout | regex_search('LANGUAGE=([^\n]+)', '\\1') | default([locale_lang], true) | first }}"
|
||||||
ansible.builtin.command:
|
ansible.builtin.command:
|
||||||
cmd: localectl set-locale LANGUAGE={{ set_locale_language }}
|
cmd: localectl set-locale LANGUAGE={{ locale_config_language }}
|
||||||
|
|||||||
Reference in New Issue
Block a user