diff --git a/playbooks/prerequisites/debian.yml b/playbooks/prerequisites/debian.yml index ffee520e..6c0fb8f9 100644 --- a/playbooks/prerequisites/debian.yml +++ b/playbooks/prerequisites/debian.yml @@ -2,6 +2,7 @@ - name: install pillow prerequisites for Debian < 8 apt: pkg={{ item }} state=present with_items: + - libjpeg8-dev - libtiff4-dev - tcl8.5-dev - tk8.5-dev @@ -10,6 +11,7 @@ - name: install pillow prerequisites for Debian >= 8 apt: pkg={{ item }} state=present with_items: + - libjpeg62-turbo-dev - libtiff5-dev - tcl8.5-dev - tk8.5-dev diff --git a/playbooks/prerequisites/install_prerequisites.yml b/playbooks/prerequisites/install_prerequisites.yml index a2a84c2e..6fb0a066 100644 --- a/playbooks/prerequisites/install_prerequisites.yml +++ b/playbooks/prerequisites/install_prerequisites.yml @@ -80,14 +80,13 @@ - apt-transport-https - libsasl2-dev - libldap2-dev - - libjpeg8-dev - when: ansible_os_family == 'Debian' or ansible_distribution == 'Ubuntu' + when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu' - include: ubuntu.yml when: ansible_distribution == 'Ubuntu' - include: debian.yml - when: ansible_os_family == 'Debian' + when: ansible_distribution == 'Debian' # Prerequisite for MACOS - name: install prequisites for macos diff --git a/playbooks/prerequisites/roles/locale/tasks/main.yml b/playbooks/prerequisites/roles/locale/tasks/main.yml index 4e402ca2..3168f70b 100644 --- a/playbooks/prerequisites/roles/locale/tasks/main.yml +++ b/playbooks/prerequisites/roles/locale/tasks/main.yml @@ -2,14 +2,15 @@ - name: Check current locale shell: localectl register: locale_test + when: ansible_distribution == 'Centos' or ansible_distribution == 'Ubuntu' - name: Set Locale command: "localectl set-locale LANG={{ locale_lang }}" - when: locale_test.stdout.find('LANG={{ locale_lang }}') == -1 + when: (ansible_distribution == 'Centos' or ansible_distribution == 'Ubuntu') and locale_test.stdout.find('LANG={{ locale_lang }}') == -1 - name: Set keymap command: "localectl set-keymap {{ locale_keymap }}" - when: "locale_test.stdout.find('Keymap: {{locale_keymap}}') == -1" + when: "(ansible_distribution == 'Centos' or ansible_distribution == 'Ubuntu') and locale_test.stdout.find('Keymap: {{locale_keymap}}') == -1" - name: Set Locale as en_US lineinfile: dest=/etc/environment backup=yes line="{{ item }}" diff --git a/playbooks/prerequisites/ubuntu.yml b/playbooks/prerequisites/ubuntu.yml index 0b7b1bd3..3e0918cd 100644 --- a/playbooks/prerequisites/ubuntu.yml +++ b/playbooks/prerequisites/ubuntu.yml @@ -2,6 +2,7 @@ - name: install pillow prerequisites for Ubuntu < 14.04 apt: pkg={{ item }} state=present force=yes with_items: + - libjpeg8-dev - libtiff4-dev - tcl8.5-dev - tk8.5-dev @@ -10,6 +11,7 @@ - name: install pillow prerequisites for Ubuntu >= 14.04 apt: pkg={{ item }} state=present force=yes with_items: + - libjpeg8-dev - libtiff5-dev - tcl8.6-dev - tk8.6-dev