Skip to content
Snippets Groups Projects
Commit cac995ed authored by jurgenhaas's avatar jurgenhaas
Browse files

ansible-playbooks/general#72 All includes are now include_tasks and they...

ansible-playbooks/general#72 All includes are now include_tasks and they always have a tag associated
parent 1c116347
No related branches found
No related tags found
No related merge requests found
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
- name: "PHP Role" - name: "PHP Role"
set_fact: role_php_started=true set_fact: role_php_started=true
tags: always tags: 'always'
- block: - block:
- import_tasks: php.yml - include_tasks: php.yml
tags: 'always'
- name: "Link PhpEnMod for PHP 5.3" - name: "Link PhpEnMod for PHP 5.3"
file: file:
...@@ -25,6 +26,6 @@ ...@@ -25,6 +26,6 @@
- name: 'PHP | Remember that this role had been run' - name: 'PHP | Remember that this role had been run'
set_fact: role_php_completed=true set_fact: role_php_completed=true
tags: always tags: 'always'
when: '"php" not in excluded_roles and role_php_completed is not defined' when: '"php" not in excluded_roles and role_php_completed is not defined'
...@@ -49,8 +49,9 @@ ...@@ -49,8 +49,9 @@
notify: notify:
- "Apache | Restart Apache" - "Apache | Restart Apache"
- import_tasks: php53.yml - include_tasks: php53.yml
when: php_version|default('5.5') == '5.3' when: php_version|default('5.5') == '5.3'
tags: 'always'
- name: "PHP | Configuration file, fcgid.conf" - name: "PHP | Configuration file, fcgid.conf"
template: template:
...@@ -106,8 +107,9 @@ ...@@ -106,8 +107,9 @@
owner=www-data owner=www-data
group=www-data group=www-data
- import_tasks: oci-{{ php_version|default('5.5') }}.yml - include_tasks: oci-{{ php_version|default('5.5') }}.yml
when: repository is defined and php_needs_oci8 when: repository is defined and php_needs_oci8
tags: 'always'
- name: "PHP | Ensure ImageMagick config directory" - name: "PHP | Ensure ImageMagick config directory"
file: file:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment