From b45de002ff57b2abc739b33e5a0d2f140fe59f71 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 11 Jun 2019 19:33:43 +0200
Subject: [PATCH] ansible-playbooks/general#85 Name import and include tasks
---
tasks/install.yml | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/tasks/install.yml b/tasks/install.yml
index c56ba0e..35e0dab 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -54,26 +54,32 @@
failed_when: no
- block:
- - set_fact:
+ - name: Set default facts
+ set_fact:
drupal_first_installation: no
- - set_fact:
+ - name: Set facts for first installation
+ set_fact:
drupal_first_installation: yes
when: drupal_install_drupal and drupal_available is defined and drupal_available.stdout != [drupalRoot, '/index.php']|join('')
tags:
- always
-- include_tasks: install/{{ installSource.mode|default("none") }}.yml
+- name: Include install mode
+ include_tasks: install/{{ installSource.mode|default("none") }}.yml
when: drupal_first_installation
-- include_tasks: install/{{ drupal.version|default("d7") }}.yml
+- name: Include install version
+ include_tasks: install/{{ drupal.version|default("d7") }}.yml
when: drupal_first_installation
-- include_tasks: deploy/{{ installSource.mode|default("none") }}.yml
+- name: Include deploy mode
+ include_tasks: deploy/{{ installSource.mode|default("none") }}.yml
when: drupal_install_drupal
tags:
- deploy
-- include_tasks: deploy/{{ drupal.version|default("d7") }}.yml
+- name: Include deploy version
+ include_tasks: deploy/{{ drupal.version|default("d7") }}.yml
when: drupal_install_drupal
tags:
- deploy
@@ -95,14 +101,16 @@
tags:
- ApacheConfig
-- include_tasks: scss.yml
+- name: Include scss
+ include_tasks: scss.yml
with_items: '{{ drupal.scss_dir|default([]) }}'
loop_control:
loop_var: scss_dir
tags:
- deploy
-- include_tasks: users/{{ installSource.mode|default("none") }}.yml
+- name: Include users mode
+ include_tasks: users/{{ installSource.mode|default("none") }}.yml
when: drupal_install_drupal and drupal.src is defined and drupal.src.name is defined
tags:
- SetPermissions
@@ -142,11 +150,13 @@
mode: 0775
when: drupal.install_extra_dirs|default(true)
-- include_tasks: mountpoints.yml
+- name: Include mountpoints
+ include_tasks: mountpoints.yml
with_items: '{{ drupal.mountpoints|default([]) }}'
when: drupal.install_extra_dirs|default(true)
-- include_tasks: files.yml
+- name: Include files
+ include_tasks: files.yml
with_nested:
- '{{ drupal.domains }}'
- ['files', 'private']
@@ -209,7 +219,8 @@
- deploy
when: drush_version_main|default('8') == '9'
-- include_tasks: deploy/finalize_{{ drupal.version|default("d7") }}.yml
+- name: Include deploy finalize version
+ include_tasks: deploy/finalize_{{ drupal.version|default("d7") }}.yml
when: drupal_install_drupal
tags:
- deploy
--
GitLab