bofh/ansible-role-common
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ansible_distribution logic

Browse Source
This commit is contained in:
Daniel A. Maierhofer
2018-09-20 12:34:20 +02:00
parent 32cb76a1d5
commit cff8ce0098
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/locales.yml
View File

@@ -1,9 +1,9 @@
---
- name: set locales
locale_gen: name="{{ item.name }}" state="{{ item.state | default('present') }}"
locale_gen: "name={{ item.name }} state={{ item.state | default('present') }}"
with_items: "{{ common_locales }}"
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
- name: set default locale
lineinfile: dest="/etc/default/locale" regexp="LANG=" line="LANG={{ common_locales_default }}"
lineinfile: "dest=/etc/default/locale regexp=LANG= line=LANG={{ common_locales_default }}"
when: common_locales_default and (ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu')

2
tasks/main.yml
View File

@@ -16,7 +16,7 @@
tags: ['common', 'xbps']
- import_tasks: cronie.yml
when: common_cronie and (ansible_distribution != 'Debian' or ansible_distribution != 'Ubuntu')
when: common_cronie and ansible_distribution != 'Debian' and ansible_distribution != 'Ubuntu'
tags: ['common', 'cronie']
- import_tasks: locales.yml