From 464a276e04501605ad5ea93e923acc930660acad Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sun, 25 Mar 2018 15:55:51 +0200
Subject: [PATCH] ansible-playbooks/general#72 Always use import_tasks or
include_tasks instead of just include
---
tasks/main.yml | 2 +-
tasks/php.yml | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index 3180386..b38c020 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,7 +11,7 @@
- block:
- - include: php.yml
+ - import_tasks: php.yml
- name: "Link PhpEnMod for PHP 5.3"
file:
diff --git a/tasks/php.yml b/tasks/php.yml
index 28edbbf..2a5f3da 100644
--- a/tasks/php.yml
+++ b/tasks/php.yml
@@ -49,9 +49,8 @@
notify:
- "Apache | Restart Apache"
-- include_tasks: php53.yml
+- import_tasks: php53.yml
when: php_version|default('5.5') == '5.3'
- tags: 'always'
- name: "PHP | Configuration file, fcgid.conf"
template:
@@ -107,10 +106,10 @@
owner=www-data
group=www-data
-- include_tasks: oci-{{ php_version|default('5.5') }}.yml
+- import_tasks: oci-{{ php_version|default('5.5') }}.yml
when: repository is defined and php_needs_oci8
-- include_tasks: msodbc.yml
+- import_tasks: msodbc.yml
when: php_needs_msodbc
- name: "PHP | Ensure ImageMagick config directory"
--
GitLab