Fixes #236: Fix include and static deprecation notices in Ansible 2.4+.

This commit is contained in:
Jeff Geerling 2018-04-26 12:34:04 -05:00
parent e543933a92
commit 869625fcf0
2 changed files with 8 additions and 15 deletions

View File

@ -6,7 +6,7 @@ galaxy_info:
description: PHP for RedHat/CentOS/Fedora/Debian/Ubuntu.
company: "Midwestern Mac, LLC"
license: "license (BSD, MIT)"
min_ansible_version: 2.0
min_ansible_version: 2.4
platforms:
- name: EL
versions:

View File

@ -49,25 +49,18 @@
when: php_fpm_conf_path is not defined
# Setup/install tasks.
- include: setup-RedHat.yml
- include_tasks: setup-RedHat.yml
when: (php_install_from_source == false) and (ansible_os_family == 'RedHat')
static: no
- include: setup-Debian.yml
- include_tasks: setup-Debian.yml
when: (php_install_from_source == false) and (ansible_os_family == 'Debian')
static: no
# Install PHP from source when php_install_from_source is true.
- include: install-from-source.yml
- include_tasks: install-from-source.yml
when: php_install_from_source == true
static: no
# Configure PHP.
- include: configure.yml
static: no
- include: configure-apcu.yml
static: no
- include: configure-opcache.yml
static: no
- include: configure-fpm.yml
static: no
- include_tasks: configure.yml
- include_tasks: configure-apcu.yml
- include_tasks: configure-opcache.yml
- include_tasks: configure-fpm.yml