From 161bbac2617b89fbec31e4fd435744d2a4c913ea Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 1 Mar 2022 17:00:06 +0100 Subject: [PATCH] Update to 2022-03-01 17:00 --- roles/documize/tasks/main.yml | 37 ++++++++++++------- roles/dokuwiki/tasks/main.yml | 5 ++- roles/dolibarr/tasks/main.yml | 31 ++++++++++------ roles/elasticsearch/tasks/main.yml | 43 ++++++++++++++-------- roles/includes/webapps_create_mysql_db.yml | 3 ++ roles/matrix_element/defaults/main.yml | 4 +- roles/matrix_element/tasks/main.yml | 28 +++++++++----- 7 files changed, 98 insertions(+), 53 deletions(-) diff --git a/roles/documize/tasks/main.yml b/roles/documize/tasks/main.yml index 14d37ac..7d0fae2 100644 --- a/roles/documize/tasks/main.yml +++ b/roles/documize/tasks/main.yml @@ -1,16 +1,27 @@ --- -- include: user.yml -- include: directories.yml -- include: facts.yml -- include: archive_pre.yml - when: documize_install_mode == 'upgrade' -- include: install.yml -- include: conf.yml -- include: iptables.yml +- include_tasks: user.yml + tags: always +- include_tasks: directories.yml + tags: always +- include_tasks: facts.yml + tags: always +- include_tasks: archive_pre.yml + when: documize_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: conf.yml + tags: always +- include_tasks: iptables.yml when: iptables_manage | default(True) -- include: services.yml -- include: write_version.yml -- include: archive_post.yml - when: documize_install_mode == 'upgrade' -- include: cleanup.yml + tags: always +- include_tasks: services.yml + tags: always +- include_tasks: write_version.yml + tags: always +- include_tasks: archive_post.yml + when: documize_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: cleanup.yml + tags: always diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml index 3248959..c2a6c1e 100644 --- a/roles/dokuwiki/tasks/main.yml +++ b/roles/dokuwiki/tasks/main.yml @@ -389,5 +389,6 @@ changed_when: False tags: dokuwiki -- include: filebeat.yml -... +- include_tasks: filebeat.yml + tags: always + diff --git a/roles/dolibarr/tasks/main.yml b/roles/dolibarr/tasks/main.yml index 31dde84..b37c5c7 100644 --- a/roles/dolibarr/tasks/main.yml +++ b/roles/dolibarr/tasks/main.yml @@ -1,13 +1,22 @@ --- -- include: user.yml -- include: directories.yml -- include: facts.yml -- include: archive_pre.yml - when: dolibarr_install_mode == 'upgrade' -- include: install.yml -- include: conf.yml -- include: archive_post.yml - when: dolibarr_install_mode == 'upgrade' -- include: write_version.yml -- include: cleanup.yml +- include_tasks: user.yml + tags: always +- include_tasks: directories.yml + tags: always +- include_tasks: facts.yml + tags: always +- include_tasks: archive_pre.yml + when: dolibarr_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: conf.yml + tags: always +- include_tasks: archive_post.yml + when: dolibarr_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: write_version.yml + tags: always +- include_tasks: cleanup.yml + tags: always diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index 132acc4..2cf1ef2 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -1,18 +1,31 @@ --- -- include: remove_pkg.yml -- include: user.yml -- include: directories.yml -- include: facts.yml -- include: archive_pre.yml - when: es_install_mode == 'upgrade' -- include: install.yml -- include: conf.yml -- include: iptables.yml +- include_tasks: remove_pkg.yml + tags: always +- include_tasks: user.yml + tags: always +- include_tasks: directories.yml + tags: always +- include_tasks: facts.yml + tags: always +- include_tasks: archive_pre.yml + when: es_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: conf.yml + tags: always +- include_tasks: iptables.yml when: iptables_manage | default(True) -- include: services.yml -- include: backup.yml -- include: write_version.yml -- include: archive_post.yml - when: es_install_mode == 'upgrade' -- include: cleanup.yml + tags: always +- include_tasks: services.yml + tags: always +- include_tasks: backup.yml + tags: always +- include_tasks: write_version.yml + tags: always +- include_tasks: archive_post.yml + when: es_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: cleanup.yml + tags: always diff --git a/roles/includes/webapps_create_mysql_db.yml b/roles/includes/webapps_create_mysql_db.yml index 4ec07fa..a45b116 100644 --- a/roles/includes/webapps_create_mysql_db.yml +++ b/roles/includes/webapps_create_mysql_db.yml @@ -10,6 +10,9 @@ - name: Install MySQL tools package: name={{ webapps_mysql_packages }} + when: mysql_packages_installed is not defined + +- set_fact: mysql_packages_installed=True - name: Create MySQL database mysql_db: diff --git a/roles/matrix_element/defaults/main.yml b/roles/matrix_element/defaults/main.yml index 6a09231..939d597 100644 --- a/roles/matrix_element/defaults/main.yml +++ b/roles/matrix_element/defaults/main.yml @@ -5,8 +5,8 @@ element_id: element # Version to deploy, and expected sha256 -element_version: 1.10.4 -element_archive_sha256: 74d44bbbd59fc25675c179d1a5350a0b092b4f9a0abec012ae8df4d5dab5c86d +element_version: 1.10.6 +element_archive_sha256: 39e9266149ff85f593719bcf83889fcf32444e8ffac5807d7c0433f70a245df1 # Where to install element element_root_dir: /opt/matrix/element diff --git a/roles/matrix_element/tasks/main.yml b/roles/matrix_element/tasks/main.yml index 7f4d1d6..5afa899 100644 --- a/roles/matrix_element/tasks/main.yml +++ b/roles/matrix_element/tasks/main.yml @@ -1,13 +1,21 @@ --- -- include: facts.yml -- include: directories.yml -- include: archive_pre.yml - when: element_install_mode == 'upgrade' -- include: install.yml -- include: conf.yml -- include: archive_post.yml - when: element_install_mode == 'upgrade' -- include: write_version.yml -- include: cleanup.yml +- include_tasks: facts.yml + tags: always +- include_tasks: directories.yml + tags: always +- include_tasks: archive_pre.yml + when: element_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: conf.yml + tags: always +- include_tasks: archive_post.yml + when: element_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: write_version.yml + tags: always +- include_tasks: cleanup.yml + tags: always