Compat Ansible 2.5+

This commit is contained in:
Emilien Mantel
2019-01-28 14:46:58 +01:00
parent 6c3aa5443a
commit e45df940cd
8 changed files with 92 additions and 56 deletions

View File

@@ -6,18 +6,19 @@
- name: APT | Install packages
apt:
pkg: "{{ item }}"
pkg: "{{ p }}"
update_cache: yes
cache_valid_time: 3600
with_items:
- apt-transport-https
- ca-certificates
- curl
- lsb-release
- nginx
vars:
p:
- apt-transport-https
- ca-certificates
- curl
- lsb-release
- nginx
- name: INCLUDE | Sury
include: Debian/sury.yml
when: >
ansible_distribution_major_version | version_compare(9, 'eq') and
php_version | version_compare('7.1', 'ge')
ansible_distribution_major_version is version(9, 'eq') and
php_version is version('7.1', 'ge')

View File

@@ -7,7 +7,4 @@
- name: PKGNG | Install packages
pkgng:
name: "{{ item }}"
with_items:
- curl
- nginx
name: ['curl', 'nginx']

View File

@@ -48,12 +48,44 @@
dest: "{{ __nginx_conf | dirname }}/fastcgi.conf"
notify: reload nginx
- name: SERVICE | Ensure nginx is started
service:
name: nginx
state: started
when: ansible_virtualization_type != 'docker'
- block:
- name: COMMAND | Docker nginx status
command: service nginx status
args:
warn: false
changed_when: false
failed_when: false
register: ngs
- name: COMMAND | Docker start nginx
command: service nginx start
args:
warn: false
when: ngs.stdout.find('nginx is not running') != -1
when: ansible_virtualization_type == 'docker'
handlers:
- name: reload nginx
service:
name: nginx
state: reloaded
notify: docker reload nginx
- name: docker reload nginx
command: service nginx reload
args:
warn: false
notify: docker reload nginx
when: ansible_virtualization_type == 'docker'
roles:
- ../../