change distribution release codename
Some checks reported errors
continuous-integration/drone/push Build encountered an error
continuous-integration/drone/pr Build is failing

Ansible 2.2 is too old to know about buster.
Let's use LSB for that.
This commit is contained in:
Jérémy Lecour 2019-06-18 17:35:28 +02:00 committed by Jérémy Lecour
parent 6d3eaf891c
commit bee57a0b3c
32 changed files with 44 additions and 44 deletions

View file

@ -27,7 +27,7 @@
tags: tags:
- apache - apache
- packages - packages
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: basic modules are enabled - name: basic modules are enabled
apache2_module: apache2_module:

View file

@ -9,7 +9,7 @@
- name: Backports sources list is installed - name: Backports sources list is installed
template: template:
src: '{{ ansible_distribution_release }}_backports.list.j2' src: '{{ ansible_lsb.codename }}_backports.list.j2'
dest: /etc/apt/sources.list.d/backports.list dest: /etc/apt/sources.list.d/backports.list
force: yes force: yes
mode: "0640" mode: "0640"
@ -19,7 +19,7 @@
- name: Backports configuration - name: Backports configuration
copy: copy:
src: '{{ ansible_distribution_release }}_backports_preferences' src: '{{ ansible_lsb.codename }}_backports_preferences'
dest: /etc/apt/preferences.d/0-backports-defaults dest: /etc/apt/preferences.d/0-backports-defaults
force: yes force: yes
mode: "0640" mode: "0640"
@ -33,7 +33,7 @@
line: 'Acquire::Check-Valid-Until no;' line: 'Acquire::Check-Valid-Until no;'
create: yes create: yes
state: present state: present
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: Apt update - name: Apt update
apt: apt:

View file

@ -2,7 +2,7 @@
- name: Change basics repositories - name: Change basics repositories
template: template:
src: "{{ ansible_distribution_release }}_basics.list.j2" src: "{{ ansible_lsb.codename }}_basics.list.j2"
dest: /etc/apt/sources.list dest: /etc/apt/sources.list
mode: "0644" mode: "0644"
force: yes force: yes

View file

@ -3,7 +3,7 @@
# - name: Fail if distribution is not supported # - name: Fail if distribution is not supported
# fail: # fail:
# msg: "Error: Evolix public repository is not compatble with 'Debian Stretch' yet." # msg: "Error: Evolix public repository is not compatble with 'Debian Stretch' yet."
# when: ansible_distribution_release == "stretch" # when: ansible_lsb.codename == "stretch"
# tags: # tags:
# - apt # - apt

View file

@ -1,3 +1,3 @@
# {{ ansible_managed }} # {{ ansible_managed }}
deb http://pub.evolix.net/ {{ ansible_distribution_release }}/ deb http://pub.evolix.net/ {{ ansible_lsb.codename }}/

View file

@ -47,7 +47,7 @@
notify: notify:
- reload systemd - reload systemd
- restart bind - restart bind
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: touch /var/log/bind.log if non chroot - name: touch /var/log/bind.log if non chroot
file: file:

View file

@ -2,7 +2,7 @@
- name: Use the correct debian repository - name: Use the correct debian repository
set_fact: set_fact:
curator_debian_repository: '{% if ansible_distribution_release == "jessie" %}debian{% else %}debian9{% endif %}' curator_debian_repository: '{% if ansible_lsb.codename == "jessie" %}debian{% else %}debian9{% endif %}'
- name: Curator sources list is available - name: Curator sources list is available
apt_repository: apt_repository:

View file

@ -13,7 +13,7 @@
notify: apt update notify: apt update
- meta: flush_handlers - meta: flush_handlers
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: Install certbot with apt - name: Install certbot with apt
apt: apt:

View file

@ -57,13 +57,13 @@
apt_key: apt_key:
# url: https://hwraid.le-vert.net/debian/hwraid.le-vert.net.gpg.key # url: https://hwraid.le-vert.net/debian/hwraid.le-vert.net.gpg.key
data: "{{ lookup('file', 'hwraid.le-vert.net.gpg.key') }}" data: "{{ lookup('file', 'hwraid.le-vert.net.gpg.key') }}"
when: ansible_distribution_release == "stretch" when: ansible_lsb.codename == "stretch"
- name: Add HW tool repository - name: Add HW tool repository
apt_repository: apt_repository:
repo: 'deb http://hwraid.le-vert.net/debian stretch main' repo: 'deb http://hwraid.le-vert.net/debian stretch main'
state: present state: present
when: ansible_distribution_release == "stretch" when: ansible_lsb.codename == "stretch"
- name: Install packages for DELL/LSI hardware - name: Install packages for DELL/LSI hardware
apt: apt:

View file

@ -126,7 +126,7 @@
when: when:
- evolinux_packages_listchanges - evolinux_packages_listchanges
- ansible_distribution == "Debian" - ansible_distribution == "Debian"
- ansible_distribution_release == "jessie" - ansible_lsb.codename == "jessie"
- name: apt-listchanges is absent on Stretch and later - name: apt-listchanges is absent on Stretch and later
apt: apt:

View file

@ -125,7 +125,7 @@
mode: "0755" mode: "0755"
when: when:
- evolinux_system_alert5_init - evolinux_system_alert5_init
- ansible_distribution_release == "jessie" or ansible_distribution_release == "stretch" - ansible_lsb.codename == "jessie" or ansible_lsb.codename == "stretch"
- name: Enable alert5 init script (jessie/stretch) - name: Enable alert5 init script (jessie/stretch)
service: service:
@ -134,7 +134,7 @@
when: when:
- evolinux_system_alert5_init - evolinux_system_alert5_init
- evolinux_system_alert5_enable - evolinux_system_alert5_enable
- ansible_distribution_release == "jessie" or ansible_distribution_release == "stretch" - ansible_lsb.codename == "jessie" or ansible_lsb.codename == "stretch"

View file

@ -1,7 +1,7 @@
--- ---
- include: sudo_jessie.yml - include: sudo_jessie.yml
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- include: sudo_stretch.yml - include: sudo_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=') when: ansible_distribution_major_version | version_compare('9', '>=')

View file

@ -9,7 +9,7 @@
- name: Fluentd sources list is available - name: Fluentd sources list is available
apt_repository: apt_repository:
repo: "deb http://packages.treasuredata.com/3/debian/{{ ansible_distribution_release }}/ {{ ansible_distribution_release }} contrib" repo: "deb http://packages.treasuredata.com/3/debian/{{ ansible_lsb.codename }}/ {{ ansible_lsb.codename }} contrib"
filename: treasuredata filename: treasuredata
update_cache: yes update_cache: yes
state: present state: present

View file

@ -1,3 +1,3 @@
Package: haproxy libssl1.0.0 Package: haproxy libssl1.0.0
Pin: release a={{ ansible_distribution_release }}-backports Pin: release a={{ ansible_lsb.codename }}-backports
Pin-Priority: 999 Pin-Priority: 999

View file

@ -1,7 +1,7 @@
--- ---
- name: Decide which Debian release to use - name: Decide which Debian release to use
set_fact: set_fact:
java_apt_release: '{% if ansible_distribution_release == "jessie" %}jessie-backports{% else %}{{ ansible_distribution_release }}{% endif %}' java_apt_release: '{% if ansible_lsb.codename == "jessie" %}jessie-backports{% else %}{{ ansible_lsb.codename }}{% endif %}'
tags: tags:
- java - java
@ -9,7 +9,7 @@
include_role: include_role:
name: apt name: apt
tasks_from: backports.yml tasks_from: backports.yml
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
tags: tags:
- java - java

View file

@ -3,10 +3,10 @@
# - fail: # - fail:
# msg: only compatible with Debian 8 # msg: only compatible with Debian 8
# when: # when:
# - ansible_distribution != "Debian" or ansible_distribution_release != "jessie" # - ansible_distribution != "Debian" or ansible_lsb.codename != "jessie"
- include: main_jessie.yml - include: main_jessie.yml
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- include: main_stretch.yml - include: main_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=') when: ansible_distribution_major_version | version_compare('9', '>=')

View file

@ -22,7 +22,7 @@
- packages - packages
- mytop - mytop
- mysql - mysql
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
# - name: "mysql-utilities are installed (Debian 9 or later)" # - name: "mysql-utilities are installed (Debian 9 or later)"
# apt: # apt:

View file

@ -7,19 +7,19 @@
when: ansible_distribution_major_version | version_compare('9', '>=') when: ansible_distribution_major_version | version_compare('9', '>=')
- include: packages_jessie.yml - include: packages_jessie.yml
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- include: users_stretch.yml - include: users_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=') when: ansible_distribution_major_version | version_compare('9', '>=')
- include: users_jessie.yml - include: users_jessie.yml
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- include: config_stretch.yml - include: config_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=') when: ansible_distribution_major_version | version_compare('9', '>=')
- include: config_jessie.yml - include: config_jessie.yml
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- include: datadir.yml - include: datadir.yml

View file

@ -22,7 +22,7 @@
- packages - packages
- mytop - mytop
- mysql - mysql
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: "Install depends for mytop (Debian 9 or later)" - name: "Install depends for mytop (Debian 9 or later)"
apt: apt:

View file

@ -1,3 +1,3 @@
Package: nginx nginx-* libnginx-* libssl* Package: nginx nginx-* libnginx-* libssl*
Pin: release a={{ ansible_distribution_release }}-backports Pin: release a={{ ansible_lsb.codename }}-backports
Pin-Priority: 999 Pin-Priority: 999

View file

@ -19,7 +19,7 @@
- name: NodeJS sources list ({{ nodejs_apt_version }}) is available - name: NodeJS sources list ({{ nodejs_apt_version }}) is available
apt_repository: apt_repository:
repo: "deb https://deb.nodesource.com/{{ nodejs_apt_version }} {{ ansible_distribution_release }} main" repo: "deb https://deb.nodesource.com/{{ nodejs_apt_version }} {{ ansible_lsb.codename }} main"
filename: nodesource filename: nodesource
update_cache: yes update_cache: yes
state: present state: present

View file

@ -48,7 +48,7 @@
src: userlogrotate_jessie src: userlogrotate_jessie
dest: /etc/cron.weekly/userlogrotate dest: /etc/cron.weekly/userlogrotate
mode: "0755" mode: "0755"
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: "Install userlogrotate (Debian 9 or later)" - name: "Install userlogrotate (Debian 9 or later)"
copy: copy:

View file

@ -1,7 +1,7 @@
--- ---
- set_fact: - set_fact:
percona__apt_config_package_file: "percona-release_latest.{{ ansible_distribution_release }}_all.deb" percona__apt_config_package_file: "percona-release_latest.{{ ansible_lsb.codename }}_all.deb"
- name: Add Percona's official GPG key - name: Add Percona's official GPG key
apt_key: apt_key:

View file

@ -6,7 +6,7 @@
- ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<')
- include: main_jessie.yml - include: main_jessie.yml
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- include: main_stretch.yml - include: main_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=') when: ansible_distribution_major_version | version_compare('9', '>=')

View file

@ -1,7 +1,7 @@
--- ---
- include: packages_jessie.yml - include: packages_jessie.yml
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- include: packages_stretch.yml - include: packages_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=') when: ansible_distribution_major_version | version_compare('9', '>=')

View file

@ -10,7 +10,7 @@
- name: Add PGDG repository - name: Add PGDG repository
apt_repository: apt_repository:
repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_distribution_release}}-pgdg main" repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_lsb.codename}}-pgdg main"
update_cache: yes update_cache: yes
- name: Add GPG key for PGDG repository - name: Add GPG key for PGDG repository

View file

@ -1,3 +1,3 @@
Package: postgresql-{{postgresql_version}} postgresql-client-common postgresql-common libpq5 ptop Package: postgresql-{{postgresql_version}} postgresql-client-common postgresql-common libpq5 ptop
Pin: release a={{ansible_distribution_release}}-pgdg Pin: release a={{ansible_lsb.codename}}-pgdg
Pin-Priority: 999 Pin-Priority: 999

View file

@ -93,7 +93,7 @@
- nrpe - nrpe
- include: nrpe_stretch.yml - include: nrpe_stretch.yml
when: ansible_distribution_release == "stretch" and nrpe_evolix_config.stat.exists == true when: ansible_lsb.codename == "stretch" and nrpe_evolix_config.stat.exists == true
tags: tags:
- redis - redis
- nrpe - nrpe

View file

@ -8,7 +8,7 @@
- name: "Set squid name (jessie)" - name: "Set squid name (jessie)"
set_fact: set_fact:
squid_daemon_name: squid3 squid_daemon_name: squid3
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: "Set squid name (Debian 9 or later)" - name: "Set squid name (Debian 9 or later)"
set_fact: set_fact:
@ -34,7 +34,7 @@
src: squid.conf.j2 src: squid.conf.j2
dest: /etc/squid3/squid.conf dest: /etc/squid3/squid.conf
notify: "restart squid3" notify: "restart squid3"
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: "evolix whitelist is present (jessie)" - name: "evolix whitelist is present (jessie)"
copy: copy:
@ -42,7 +42,7 @@
dest: /etc/squid3/whitelist.conf dest: /etc/squid3/whitelist.conf
force: no force: no
notify: "reload squid3" notify: "reload squid3"
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: "evolinux defaults squid file (Debian 9 or later)" - name: "evolinux defaults squid file (Debian 9 or later)"
copy: copy:
@ -135,7 +135,7 @@
when: ansible_distribution_major_version | version_compare('9', '>=') when: ansible_distribution_major_version | version_compare('9', '>=')
- include: logrotate_jessie.yml - include: logrotate_jessie.yml
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- include: logrotate_stretch.yml - include: logrotate_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=') when: ansible_distribution_major_version | version_compare('9', '>=')

View file

@ -19,4 +19,4 @@
allow_unauthenticated: yes allow_unauthenticated: yes
with_items: with_items:
- php5-pam - php5-pam
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"

View file

@ -17,7 +17,7 @@
name: www-evoadmin name: www-evoadmin
groups: shadow groups: shadow
append: yes append: yes
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: "Create www-evoadmin (Debian 9 or later)" - name: "Create www-evoadmin (Debian 9 or later)"
user: user:
@ -52,7 +52,7 @@
dest: "{{ evoadmin_document_root }}" dest: "{{ evoadmin_document_root }}"
version: jessie version: jessie
update: no update: no
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: "Clone evoadmin repository (Debian 9 or later)" - name: "Clone evoadmin repository (Debian 9 or later)"
git: git:

View file

@ -7,7 +7,7 @@
option: "disable_functions" option: "disable_functions"
value: "shell-exec,system,passthru,putenv,popen" value: "shell-exec,system,passthru,putenv,popen"
notify: reload apache2 notify: reload apache2
when: ansible_distribution_release == "jessie" when: ansible_lsb.codename == "jessie"
- name: "Set custom values for PHP config (Debian 9 or later)" - name: "Set custom values for PHP config (Debian 9 or later)"
ini_file: ini_file: