From 390ec8a59917933724f70c0ffe88c2c1bcf4e01f Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 8 Mar 2019 12:14:54 +0200 Subject: [PATCH] Skip some tasks when not necessary to run them --- roles/matrix-synapse/tasks/ext/appservice-discord/setup.yml | 3 +++ roles/matrix-synapse/tasks/ext/appservice-irc/setup.yml | 3 +++ roles/matrix-synapse/tasks/ext/mautrix-telegram/setup.yml | 3 +++ roles/matrix-synapse/tasks/ext/mautrix-whatsapp/setup.yml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/roles/matrix-synapse/tasks/ext/appservice-discord/setup.yml b/roles/matrix-synapse/tasks/ext/appservice-discord/setup.yml index 8c4a84cb5..9589477a9 100644 --- a/roles/matrix-synapse/tasks/ext/appservice-discord/setup.yml +++ b/roles/matrix-synapse/tasks/ext/appservice-discord/setup.yml @@ -39,6 +39,7 @@ stat: path: "{{ matrix_appservice_discord_base_path }}/discord-registration.yaml" register: appservice_discord_registration_file + when: "matrix_appservice_discord_enabled" - name: Generate matrix-appservice-discord discord-registration.yaml if it doesn't exist shell: >- @@ -57,11 +58,13 @@ - set_fact: matrix_synapse_app_service_config_file_appservice_discord: '{{ matrix_appservice_discord_base_path }}/discord-registration.yml' + when: "matrix_appservice_discord_enabled" - name: Check if a matrix-appservice-discord invite_link file exists stat: path: "{{ matrix_appservice_discord_base_path }}/invite_link" register: appservice_discord_link_generated + when: "matrix_appservice_discord_enabled" - name: Generate your discord invite link shell: >- diff --git a/roles/matrix-synapse/tasks/ext/appservice-irc/setup.yml b/roles/matrix-synapse/tasks/ext/appservice-irc/setup.yml index 773efea61..9f79c3838 100644 --- a/roles/matrix-synapse/tasks/ext/appservice-irc/setup.yml +++ b/roles/matrix-synapse/tasks/ext/appservice-irc/setup.yml @@ -26,6 +26,7 @@ stat: path: "{{ matrix_appservice_irc_base_path }}/passkey.pem" register: irc_passkey_file + when: "matrix_appservice_irc_enabled" - name: Generate matrix-appservice-irc passkey if it doesn't exist shell: /usr/bin/openssl genpkey -out {{ matrix_appservice_irc_base_path }}/passkey.pem -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:2048 @@ -48,6 +49,7 @@ stat: path: "{{ matrix_appservice_irc_base_path }}/registration.yaml" register: appservice_irc_registration_file + when: "matrix_appservice_irc_enabled" - name: Generate matrix-appservice-irc registration.yaml if it doesn't exist shell: >- @@ -64,6 +66,7 @@ - set_fact: matrix_synapse_app_service_config_file_appservice_irc: '/app-registration/appservice-irc.yml' + when: "matrix_appservice_irc_enabled" - set_fact: matrix_synapse_container_additional_volumes: > diff --git a/roles/matrix-synapse/tasks/ext/mautrix-telegram/setup.yml b/roles/matrix-synapse/tasks/ext/mautrix-telegram/setup.yml index 8c2c3cd54..02487ddb8 100644 --- a/roles/matrix-synapse/tasks/ext/mautrix-telegram/setup.yml +++ b/roles/matrix-synapse/tasks/ext/mautrix-telegram/setup.yml @@ -18,6 +18,7 @@ stat: path: "{{ matrix_mautrix_telegram_base_path }}/config.yaml" register: mautrix_telegram_config_file_stat + when: "matrix_mautrix_telegram_enabled" - name: Ensure Matrix Mautrix telegram config installed template: @@ -56,6 +57,7 @@ stat: path: "{{ matrix_mautrix_telegram_base_path }}/registration.yaml" register: mautrix_telegram_registration_file_stat + when: "matrix_mautrix_telegram_enabled" - name: Generate matrix-mautrix-telegram registration.yaml if it doesn't exist shell: @@ -72,6 +74,7 @@ - set_fact: matrix_synapse_app_service_config_file_mautrix_telegram: '/app-registration/mautrix-telegram.yml' + when: "matrix_mautrix_telegram_enabled" - set_fact: matrix_synapse_container_additional_volumes: > diff --git a/roles/matrix-synapse/tasks/ext/mautrix-whatsapp/setup.yml b/roles/matrix-synapse/tasks/ext/mautrix-whatsapp/setup.yml index 5c0bc033a..065ca6733 100644 --- a/roles/matrix-synapse/tasks/ext/mautrix-whatsapp/setup.yml +++ b/roles/matrix-synapse/tasks/ext/mautrix-whatsapp/setup.yml @@ -18,6 +18,7 @@ stat: path: "{{ matrix_mautrix_whatsapp_base_path }}/config.yaml" register: mautrix_whatsapp_config_file_stat + when: "matrix_mautrix_whatsapp_enabled" - name: Ensure Matrix Mautrix whatsapp config installed template: @@ -45,6 +46,7 @@ stat: path: "{{ matrix_mautrix_whatsapp_base_path }}/registration.yaml" register: mautrix_whatsapp_registration_file_stat + when: "matrix_mautrix_whatsapp_enabled" - name: Generate matrix-mautrix-whatsapp registration.yaml if it doesn't exist shell: @@ -61,6 +63,7 @@ - set_fact: matrix_synapse_app_service_config_file_mautrix_whatsapp: '/app-registration/mautrix-whatsapp.yml' + when: "matrix_mautrix_whatsapp_enabled" - set_fact: matrix_synapse_container_additional_volumes: >