standardization for Debian versions : we use "jessie" or "9 or later" to prepare buster smoothly as possible

admin-users/tasks/sudo.yml

@@ -22,5 +22,5 @@
     validate: '/usr/sbin/visudo -cf %s'
   when:
   - ansible_distribution == "Debian"
-  - ansible_distribution_major_version | version_compare('9', '<')
+  - ansible_distribution_release == "jessie"
   - not copy_sudoers_evolinux.changed

admin-users/tasks/user.yml

@@ -39,12 +39,12 @@
   group:
     name: "{{ admin_users_group }}"
 
-- name: "Add user to sudo group (Stretch)"
+- name: "Add user to sudo group (Debian 9 or later)"
   user:
     name: '{{ user.name }}'
     groups: 'sudo,{{ admin_users_group }}'
     append: yes
-  when: ansible_distribution_release == "stretch"
+  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - name: "Fix perms on homedirectory for '{{ user.name }}'"
   file:

apache/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: packages are installed (stretch)
+- name: packages are installed (Debian 9 or later)
   apt:
     name: '{{ item }}'
     state: present
@@ -13,7 +13,7 @@
   tags:
   - apache
   - packages
-  when: ansible_distribution_release == "stretch"
+  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - name: packages are installed (jessie)
   apt:

evoacme/tasks/certbot.yml

@@ -65,7 +65,7 @@
     squid_service_name: squid3
   when:
   - ansible_distribution == "Debian"
-  - ansible_distribution_major_version | version_compare('9', '<')
+  - ansible_distribution_release == "jessie"
 
 - name: Let's Encrypt OCSP server is authorized by squid
   lineinfile:

evoadmin/tasks/web.yml

@@ -16,7 +16,7 @@
     option: "disable_functions"
     value: "shell-exec,system,passthru,putenv,popen"
   notify: reload apache
-  when: ansible_distribution_release == "stretch"
+  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - name: Install evoadmin VHost
   template:

evolinux-base/tasks/packages.yml

@@ -109,6 +109,9 @@
   with_items:
   - { option: "confirm", value: "1" }
   - { option: "which",   value: "both" }
-  when: evolinux_packages_listchanges and ansible_distribution == "Debian" and ansible_distribution_major_version | version_compare('9', '<')
+  when:
+  - evolinux_packages_listchanges
+  - ansible_distribution == "Debian"
+  - ansible_distribution_release == "jessie"
 
 - meta: flush_handlers

jenkins/tasks/main.yml

@@ -11,12 +11,12 @@
   check_mode: no
   register: squid_whitelist_files
 
-- name: set squid_service_name=squid3 for Debian < 9
+- name: set squid_service_name=squid3 for Debian 8
   set_fact:
     squid_service_name: squid3
   when:
   - ansible_distribution == "Debian"
-  - ansible_distribution_major_version | version_compare('9', '<')
+  - ansible_distribution_release == "jessie"
 
 - name: Append packages.dotdeb.org to Squid whitelist
   lineinfile:

mongodb/tasks/main.yml

@@ -7,12 +7,12 @@
   check_mode: no
   register: squid_whitelist_files
 
-- name: set squid_service_name=squid3 for Debian < 9
+- name: set squid_service_name=squid3 for Debian 8
   set_fact:
     squid_service_name: squid3
   when:
   - ansible_distribution == "Debian"
-  - ansible_distribution_major_version | version_compare('9', '<')
+  - ansible_distribution_release == "jessie"
 
 - name: Append packages.dotdeb.org to Squid whitelist
   lineinfile:

mysql/tasks/main.yml

@@ -1,13 +1,13 @@
 ---
 
 - include: packages_stretch.yml
-  when: ansible_distribution_release == "stretch"
+  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - include: packages_jessie.yml
   when: ansible_distribution_release == "jessie"
 
 - include: users_stretch.yml
-  when: ansible_distribution_release == "stretch"
+  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - include: users_jessie.yml
   when: ansible_distribution_release == "jessie"

newrelic/tasks/sources.yml

@@ -5,12 +5,12 @@
     # url: https://download.newrelic.com/548C16BF.gpg
     data: "{{ lookup('file', '548C16BF.gpg') }}"
 
-- name: set squid_service_name=squid3 for Debian < 9
+- name: set squid_service_name=squid3 for Debian 8
   set_fact:
     squid_service_name: squid3
   when:
   - ansible_distribution == "Debian"
-  - ansible_distribution_major_version | version_compare('9', '<')
+  - ansible_distribution_release == "jessie"
 
 - name: Find squid config whitelist
   shell: find /etc/{{ squid_service_name | default('squid') }}/whitelist-custom.conf /etc/{{ squid_service_name | default('squid') }}/whitelist.conf 2> /dev/null

nginx/tasks/main_regular.yml

@@ -4,7 +4,7 @@
   when: ansible_distribution_release == "jessie"
 
 - include: packages_stretch.yml
-  when: ansible_distribution_release == "stretch"
+  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 # TODO: find a way to override the main configuration
 # without touching the main file

packweb-apache/tasks/main.yml

@@ -42,7 +42,7 @@
   when: ansible_distribution_release == "jessie"
 
 - include: php.yml
-  when: ansible_distribution_release == "stretch"
+  when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - include: phpmyadmin.yml
 

php-fpm/tasks/main.yml

@@ -2,7 +2,9 @@
   apt:
     name: php5-fpm
     state: present
-  when: ansible_distribution_major_version | version_compare('8', '<=')
+  when:
+  - ansible_distribution == "Debian"
+  - ansible_distribution_release == "jessie"
   tags:
   - php-fpm
 
@@ -10,6 +12,8 @@
   apt:
     name: php-fpm
     state: present
-  when: ansible_distribution_major_version | version_compare('9', '>=')
+  when:
+  - ansible_distribution == "Debian"
+  - ansible_distribution_major_version | version_compare('9', '>=')
   tags:
   - php-fpm