From 2bb7367edfdf863a8b90734f6e848c10a7d153e2 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Fri, 18 Aug 2017 03:31:46 +0200 Subject: [PATCH] standardization for Debian versions : we use "jessie" or "9 or later" to prepare buster smoothly as possible --- admin-users/tasks/sudo.yml | 2 +- admin-users/tasks/user.yml | 4 ++-- apache/tasks/main.yml | 4 ++-- evoacme/tasks/certbot.yml | 2 +- evoadmin/tasks/web.yml | 2 +- evolinux-base/tasks/packages.yml | 5 ++++- jenkins/tasks/main.yml | 4 ++-- mongodb/tasks/main.yml | 4 ++-- mysql/tasks/main.yml | 4 ++-- newrelic/tasks/sources.yml | 4 ++-- nginx/tasks/main_regular.yml | 2 +- packweb-apache/tasks/main.yml | 2 +- php-fpm/tasks/main.yml | 8 ++++++-- 13 files changed, 27 insertions(+), 20 deletions(-) diff --git a/admin-users/tasks/sudo.yml b/admin-users/tasks/sudo.yml index 793e67d5..f8daf81f 100644 --- a/admin-users/tasks/sudo.yml +++ b/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 diff --git a/admin-users/tasks/user.yml b/admin-users/tasks/user.yml index b36f6eb6..ba72b388 100644 --- a/admin-users/tasks/user.yml +++ b/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: diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml index a3ff8cfd..c9d60dc5 100644 --- a/apache/tasks/main.yml +++ b/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: diff --git a/evoacme/tasks/certbot.yml b/evoacme/tasks/certbot.yml index eae7ba86..526fbb07 100644 --- a/evoacme/tasks/certbot.yml +++ b/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: diff --git a/evoadmin/tasks/web.yml b/evoadmin/tasks/web.yml index 7cf6c9d2..87237248 100644 --- a/evoadmin/tasks/web.yml +++ b/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: diff --git a/evolinux-base/tasks/packages.yml b/evolinux-base/tasks/packages.yml index 399f3f8f..b8c6576a 100644 --- a/evolinux-base/tasks/packages.yml +++ b/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 diff --git a/jenkins/tasks/main.yml b/jenkins/tasks/main.yml index 70f6771d..83d3ec92 100644 --- a/jenkins/tasks/main.yml +++ b/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: diff --git a/mongodb/tasks/main.yml b/mongodb/tasks/main.yml index f659df2d..f222c799 100644 --- a/mongodb/tasks/main.yml +++ b/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: diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml index be64360c..d6892fef 100644 --- a/mysql/tasks/main.yml +++ b/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" diff --git a/newrelic/tasks/sources.yml b/newrelic/tasks/sources.yml index cdcf5dc2..551fc8b5 100644 --- a/newrelic/tasks/sources.yml +++ b/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 diff --git a/nginx/tasks/main_regular.yml b/nginx/tasks/main_regular.yml index bc58503b..74580972 100644 --- a/nginx/tasks/main_regular.yml +++ b/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 diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml index 17e3909c..1aefaa7b 100644 --- a/packweb-apache/tasks/main.yml +++ b/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 diff --git a/php-fpm/tasks/main.yml b/php-fpm/tasks/main.yml index f05ae125..de12d1a7 100644 --- a/php-fpm/tasks/main.yml +++ b/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