Add install-* tags for quicker runs

2022-11-25 16:02:51 +02:00 · 2022-11-25 16:02:51 +02:00 · 61f67d8f0a
parent 34c01da9d2
commit 61f67d8f0a
67 changed files with 449 additions and 7 deletions
--- a/roles/custom/matrix-aux/tasks/main.yml
+++ b/roles/custom/matrix-aux/tasks/main.yml
@ -5,3 +5,5 @@
  tags:
    - setup-all
    - setup-aux-files
+    - install-all
+    - install-aux-files
--- a/roles/custom/matrix-backup-borg/tasks/main.yml
+++ b/roles/custom/matrix-backup-borg/tasks/main.yml
@ -6,7 +6,13 @@

    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
      when: "run_setup | bool and matrix_backup_borg_enabled | bool"
+  tags:
+    - setup-all
+    - setup-backup-borg
+    - install-all
+    - install-backup-borg

+- block:
    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
      when: "run_setup | bool and not matrix_backup_borg_enabled | bool"
  tags:
--- a/roles/custom/matrix-base/tasks/main.yml
+++ b/roles/custom/matrix-base/tasks/main.yml
@ -4,6 +4,7 @@
    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
  tags:
    - setup-all
+    - install-all

 # This needs to always run, because it populates `matrix_user_uid` and `matrix_user_gid`,
 # which are required by many other roles.
@ -18,6 +19,7 @@
    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_matrix_base.yml"
  tags:
    - setup-all
+    - install-all
    - common

 - block:
@ -27,4 +29,11 @@
    - setup-ma1sd
    - setup-synapse
    - setup-dendrite
+    - setup-conduit
    - setup-nginx-proxy
+    - install-all
+    - install-ma1sd
+    - install-synapse
+    - install-dendrite
+    - install-conduit
+    - install-nginx-proxy
--- a/roles/custom/matrix-bot-buscarron/tasks/main.yml
+++ b/roles/custom/matrix-bot-buscarron/tasks/main.yml
@ -6,7 +6,13 @@

    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
      when: "run_setup | bool and matrix_bot_buscarron_enabled | bool"
+  tags:
+    - setup-all
+    - setup-bot-buscarron
+    - install-all
+    - install-bot-buscarron

+- block:
    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
      when: "run_setup | bool and not matrix_bot_buscarron_enabled | bool"
  tags:
--- a/roles/custom/matrix-bot-go-neb/tasks/main.yml
+++ b/roles/custom/matrix-bot-go-neb/tasks/main.yml
@ -6,7 +6,13 @@

    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
      when: "run_setup | bool and matrix_bot_go_neb_enabled | bool"
+  tags:
+    - setup-all
+    - setup-bot-go-neb
+    - install-all
+    - install-bot-go-neb

+- block:
    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
      when: "run_setup | bool and not matrix_bot_go_neb_enabled | bool"
  tags:
--- a/roles/custom/matrix-bot-honoroit/tasks/main.yml
+++ b/roles/custom/matrix-bot-honoroit/tasks/main.yml
@ -6,7 +6,13 @@

    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
      when: "run_setup | bool and matrix_bot_honoroit_enabled | bool"
+  tags:
+    - setup-all
+    - setup-bot-honoroit
+    - install-all
+    - install-bot-honoroit

+- block:
    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
      when: "run_setup | bool and not matrix_bot_honoroit_enabled | bool"
  tags:
--- a/roles/custom/matrix-bot-matrix-registration-bot/tasks/main.yml
+++ b/roles/custom/matrix-bot-matrix-registration-bot/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_bot_matrix_registration_bot_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-bot-matrix-registration-bot
+    - install-all
+    - install-bot-matrix-registration-bot

+- block:
    - when: not matrix_bot_matrix_registration_bot_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bot-matrix-reminder-bot/tasks/main.yml
+++ b/roles/custom/matrix-bot-matrix-reminder-bot/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_bot_matrix_reminder_bot_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-bot-matrix-reminder-bot
+    - install-all
+    - install-bot-matrix-reminder-bot

+- block:
    - when: not matrix_bot_matrix_reminder_bot_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bot-maubot/tasks/main.yml
+++ b/roles/custom/matrix-bot-maubot/tasks/main.yml
@ -6,7 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
-
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_bot_maubot_enabled | bool
@ -14,7 +15,13 @@

    - when: matrix_bot_maubot_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-bot-maubot
+    - install-all
+    - install-bot-maubot

+- block:
    - when: not matrix_bot_maubot_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bot-mjolnir/tasks/main.yml
+++ b/roles/custom/matrix-bot-mjolnir/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_bot_mjolnir_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-bot-mjolnir
+    - install-all
+    - install-bot-mjolnir

+- block:
    - when: not matrix_bot_mjolnir_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bot-postmoogle/tasks/main.yml
+++ b/roles/custom/matrix-bot-postmoogle/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_bot_postmoogle_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-bot-postmoogle
+    - install-all
+    - install-bot-postmoogle

+- block:
    - when: not matrix_bot_postmoogle_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-appservice-discord/tasks/main.yml
+++ b/roles/custom/matrix-bridge-appservice-discord/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_appservice_discord_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-appservice-discord
+    - install-all
+    - install-appservice-discord

+- block:
    - when: not matrix_appservice_discord_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-appservice-irc/tasks/main.yml
+++ b/roles/custom/matrix-bridge-appservice-irc/tasks/main.yml
@ -6,9 +6,16 @@

    - when: matrix_appservice_irc_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-appservice-irc
+    - install-all
+    - install-appservice-irc

+- block:
    - when: not matrix_appservice_irc_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
    - setup-all
    - setup-appservice-irc
+
--- a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/main.yml
+++ b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_appservice_kakaotalk_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-appservice-kakaotalk
+    - install-all
+    - install-appservice-kakaotalk

+- block:
    - when: not matrix_appservice_kakaotalk_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-appservice-slack/tasks/main.yml
+++ b/roles/custom/matrix-bridge-appservice-slack/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_appservice_slack_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_appservice_slack_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-appservice-slack
+    - install-all
+    - install-appservice-slack

+- block:
    - when: not matrix_appservice_slack_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-appservice-webhooks/tasks/main.yml
+++ b/roles/custom/matrix-bridge-appservice-webhooks/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_appservice_webhooks_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_appservice_webhooks_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-appservice-webhooks
+    - install-all
+    - install-appservice-webhooks

+- block:
    - when: not matrix_appservice_webhooks_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-beeper-linkedin/tasks/main.yml
+++ b/roles/custom/matrix-bridge-beeper-linkedin/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_beeper_linkedin_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-beeper-linkedin
+    - install-all
+    - install-beeper-linkedin

+- block:
    - when: not matrix_beeper_linkedin_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-go-skype-bridge/tasks/main.yml
+++ b/roles/custom/matrix-bridge-go-skype-bridge/tasks/main.yml
@ -6,9 +6,16 @@

    - when: matrix_go_skype_bridge_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-go-skype-bridge
+    - install-all
+    - install-go-skype-bridge

+- block:
    - when: not matrix_go_skype_bridge_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
    - setup-all
    - setup-go-skype-bridge
+
--- a/roles/custom/matrix-bridge-heisenbridge/tasks/main.yml
+++ b/roles/custom/matrix-bridge-heisenbridge/tasks/main.yml
@ -3,7 +3,13 @@
 - block:
    - when: matrix_heisenbridge_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-heisenbridge
+    - install-all
+    - install-heisenbridge

+- block:
    - when: not matrix_heisenbridge_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-hookshot/tasks/main.yml
+++ b/roles/custom/matrix-bridge-hookshot/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_hookshot_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_hookshot_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-hookshot
+    - install-all
+    - install-hookshot

+- block:
    - when: not matrix_hookshot_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mautrix-discord/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-discord/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_mautrix_discord_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mautrix-discord
+    - install-all
+    - install-mautrix-discord

+- block:
    - when: not matrix_mautrix_discord_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mautrix-facebook/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-facebook/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_mautrix_facebook_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_mautrix_facebook_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mautrix-facebook
+    - install-all
+    - install-mautrix-facebook

+- block:
    - when: not matrix_mautrix_facebook_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mautrix-googlechat/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-googlechat/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_mautrix_googlechat_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_mautrix_googlechat_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mautrix-googlechat
+    - install-all
+    - install-mautrix-googlechat

+- block:
    - when: not matrix_mautrix_googlechat_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mautrix-hangouts/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-hangouts/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_mautrix_hangouts_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_mautrix_hangouts_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mautrix-hangouts
+    - install-all
+    - install-mautrix-hangouts

+- block:
    - when: not matrix_mautrix_hangouts_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mautrix-instagram/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-instagram/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_mautrix_instagram_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mautrix-instagram
+    - install-all
+    - install-mautrix-instagram

+- block:
    - when: not matrix_mautrix_instagram_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mautrix-signal/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-signal/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_mautrix_signal_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mautrix-signal
+    - install-all
+    - install-mautrix-signal

+- block:
    - when: not matrix_mautrix_signal_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mautrix-telegram/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-telegram/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_mautrix_telegram_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_mautrix_telegram_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mautrix-telegram
+    - install-all
+    - install-mautrix-telegram

+- block:
    - when: not matrix_mautrix_telegram_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mautrix-twitter/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-twitter/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_mautrix_twitter_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mautrix-twitter
+    - install-all
+    - install-mautrix-twitter

+- block:
    - when: not matrix_mautrix_twitter_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mautrix-whatsapp/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-whatsapp/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_mautrix_whatsapp_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mautrix-whatsapp
+    - install-all
+    - install-mautrix-whatsapp

+- block:
    - when: not matrix_mautrix_whatsapp_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mx-puppet-discord/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mx-puppet-discord/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_mx_puppet_discord_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mx-puppet-discord
+    - install-all
+    - install-mx-puppet-discord

+- block:
    - when: not matrix_mx_puppet_discord_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_mx_puppet_groupme_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mx-puppet-groupme
+    - install-all
+    - install-mx-puppet-groupme

+- block:
    - when: not matrix_mx_puppet_groupme_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_mx_puppet_instagram_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mx-puppet-instagram
+    - install-all
+    - install-mx-puppet-instagram

+- block:
    - when: not matrix_mx_puppet_instagram_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mx-puppet-slack/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mx-puppet-slack/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_mx_puppet_slack_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_mx_puppet_slack_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mx-puppet-slack
+    - install-all
+    - install-mx-puppet-slack

+- block:
    - when: not matrix_mx_puppet_slack_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mx-puppet-steam/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mx-puppet-steam/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_mx_puppet_steam_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mx-puppet-steam
+    - install-all
+    - install-mx-puppet-steam

+- block:
    - when: not matrix_mx_puppet_steam_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-mx-puppet-twitter/tasks/main.yml
+++ b/roles/custom/matrix-bridge-mx-puppet-twitter/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_mx_puppet_twitter_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_mx_puppet_twitter_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mx-puppet-twitter
+    - install-all
+    - install-mx-puppet-twitter

+- block:
    - when: not matrix_mx_puppet_twitter_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-bridge-sms/tasks/main.yml
+++ b/roles/custom/matrix-bridge-sms/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_sms_bridge_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-matrix-sms-bridge
+    - install-all
+    - install-matrix-sms-bridge

+- block:
    - when: not matrix_sms_bridge_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-cactus-comments/tasks/main.yml
+++ b/roles/custom/matrix-cactus-comments/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_cactus_comments_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_cactus_comments_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-cactus-comments
+    - install-all
+    - install-cactus-comments

+- block:
    - when: not matrix_cactus_comments_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-client-cinny/tasks/main.yml
+++ b/roles/custom/matrix-client-cinny/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_client_cinny_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-client-cinny
+    - install-all
+    - install-client-cinny

+- block:
    - when: not matrix_client_cinny_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-client-element/tasks/main.yml
+++ b/roles/custom/matrix-client-element/tasks/main.yml
@ -9,7 +9,13 @@

    - when: matrix_client_element_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-client-element
+    - install-all
+    - install-client-element

+- block:
    - when: not matrix_client_element_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-client-hydrogen/tasks/main.yml
+++ b/roles/custom/matrix-client-hydrogen/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_client_hydrogen_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-client-hydrogen
+    - install-all
+    - install-client-hydrogen

+- block:
    - when: not matrix_client_hydrogen_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-conduit/tasks/main.yml
+++ b/roles/custom/matrix-conduit/tasks/main.yml
@ -3,7 +3,13 @@
 - block:
    - when: matrix_conduit_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-conduit
+    - install-all
+    - install-conduit

+- block:
    - when: not matrix_conduit_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-corporal/tasks/main.yml
+++ b/roles/custom/matrix-corporal/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_corporal_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-corporal
+    - install-all
+    - install-corporal

+- block:
    - when: not matrix_corporal_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-coturn/tasks/main.yml
+++ b/roles/custom/matrix-coturn/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_coturn_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-coturn
+    - install-all
+    - install-coturn

+- block:
    - when: not matrix_coturn_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-dendrite/tasks/main.yml
+++ b/roles/custom/matrix-dendrite/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_dendrite_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-dendrite
+    - install-all
+    - install-dendrite

+- block:
    - when: not matrix_dendrite_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-dimension/tasks/main.yml
+++ b/roles/custom/matrix-dimension/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_dimension_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-dimension
+    - install-all
+    - install-dimension

+- block:
    - when: not matrix_dimension_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-dynamic-dns/tasks/main.yml
+++ b/roles/custom/matrix-dynamic-dns/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_dynamic_dns_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-dynamic-dns
+    - install-all
+    - install-dynamic-dns

+- block:
    - when: not matrix_dynamic_dns_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-email2matrix/tasks/main.yml
+++ b/roles/custom/matrix-email2matrix/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_email2matrix_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-email2matrix
+    - install-all
+    - install-email2matrix

+- block:
    - when: not matrix_email2matrix_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-etherpad/tasks/main.yml
+++ b/roles/custom/matrix-etherpad/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_etherpad_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_etherpad_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-etherpad
+    - install-all
+    - install-etherpad

+- block:
    - when: not matrix_etherpad_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-grafana/tasks/main.yml
+++ b/roles/custom/matrix-grafana/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_grafana_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-grafana
+    - install-all
+    - install-grafana

+- block:
    - when: not matrix_grafana_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-jitsi/tasks/main.yml
+++ b/roles/custom/matrix-jitsi/tasks/main.yml
@ -5,6 +5,7 @@
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/init_additional_jvb.yml"
  tags:
    - setup-additional-jitsi-jvb
+    - install-additional-jitsi-jvb

 - block:
    - when: matrix_jitsi_enabled | bool
@ -16,22 +17,31 @@
    - setup-all
    - setup-jitsi
    - setup-additional-jitsi-jvb
+    - install-all
+    - install-jitsi
+    - install-additional-jitsi-jvb

 - block:
    - when: matrix_jitsi_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_jitsi_web_install.yml"

-    - when: not matrix_jitsi_enabled | bool
-      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_jitsi_web_uninstall.yml"
-
    - when: matrix_jitsi_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_jitsi_prosody_install.yml"

-    - when: not matrix_jitsi_enabled | bool
-      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_jitsi_prosody_uninstall.yml"
-
    - when: matrix_jitsi_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_jitsi_jicofo_install.yml"
+  tags:
+    - setup-all
+    - setup-jitsi
+    - install-all
+    - install-jitsi
+
+- block:
+    - when: not matrix_jitsi_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_jitsi_web_uninstall.yml"
+
+    - when: not matrix_jitsi_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_jitsi_prosody_uninstall.yml"

    - when: not matrix_jitsi_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_jitsi_jicofo_uninstall.yml"
@ -42,7 +52,15 @@
 - block:
    - when: matrix_jitsi_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_jitsi_jvb_install.yml"
+  tags:
+    - setup-all
+    - setup-jitsi
+    - setup-additional-jitsi-jvb
+    - install-all
+    - install-jitsi
+    - install-additional-jitsi-jvb

+- block:
    - when: not matrix_jitsi_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_jitsi_jvb_uninstall.yml"
  tags:
--- a/roles/custom/matrix-ldap-registration-proxy/tasks/main.yml
+++ b/roles/custom/matrix-ldap-registration-proxy/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_ldap_registration_proxy_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_ldap_registration_proxy_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-matrix-ldap-registration-proxy
+    - install-all
+    - install-matrix-ldap-registration-proxy

+- block:
    - when: not matrix_ldap_registration_proxy_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-ma1sd/tasks/main.yml
+++ b/roles/custom/matrix-ma1sd/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_ma1sd_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-ma1sd
+    - install-all
+    - install-ma1sd

+- block:
    - when: not matrix_ma1sd_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-mailer/tasks/main.yml
+++ b/roles/custom/matrix-mailer/tasks/main.yml
@ -3,7 +3,13 @@
 - block:
    - when: matrix_mailer_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-mailer
+    - install-all
+    - install-mailer

+- block:
    - when: not matrix_mailer_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-nginx-proxy/tasks/main.yml
+++ b/roles/custom/matrix-nginx-proxy/tasks/main.yml
@ -8,6 +8,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - ansible.builtin.import_tasks: "{{ role_path }}/tasks/ssl/main.yml"
  when: run_setup | bool
@ -15,12 +17,17 @@
    - setup-all
    - setup-nginx-proxy
    - setup-ssl
+    - install-all
+    - install-nginx-proxy
+    - install-ssl

 - ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_nginx_proxy.yml"
  when: run_setup | bool
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/self_check_well_known.yml"
--- a/roles/custom/matrix-ntfy/tasks/main.yml
+++ b/roles/custom/matrix-ntfy/tasks/main.yml
@ -3,7 +3,13 @@
 - block:
    - when: matrix_ntfy_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-ntfy
+    - install-all
+    - install-ntfy

+- block:
    - when: not matrix_ntfy_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-postgres-backup/tasks/main.yml
+++ b/roles/custom/matrix-postgres-backup/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_postgres_backup_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-postgres-backup
+    - install-all
+    - install-postgres-backup

+- block:
    - when: not matrix_postgres_backup_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-postgres/tasks/main.yml
+++ b/roles/custom/matrix-postgres/tasks/main.yml
@ -5,12 +5,14 @@
  tags:
    - setup-all
    - setup-postgres
+    - install-postgres

 - ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_postgres.yml"
  when: run_setup | bool
  tags:
    - setup-all
    - setup-postgres
+    - install-postgres

 - ansible.builtin.import_tasks: "{{ role_path }}/tasks/import_postgres.yml"
  when: run_postgres_import | bool
--- a/roles/custom/matrix-prometheus-node-exporter/tasks/main.yml
+++ b/roles/custom/matrix-prometheus-node-exporter/tasks/main.yml
@ -6,11 +6,19 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_prometheus_node_exporter_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-prometheus-node-exporter
+    - install-all
+    - install-prometheus-node-exporter

+- block:
    - when: not matrix_prometheus_node_exporter_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-prometheus-postgres-exporter/tasks/main.yml
+++ b/roles/custom/matrix-prometheus-postgres-exporter/tasks/main.yml
@ -6,11 +6,19 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_prometheus_postgres_exporter_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-prometheus-postgres-exporter
+    - install-all
+    - install-prometheus-postgres-exporter

+- block:
    - when: not matrix_prometheus_postgres_exporter_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-prometheus/tasks/main.yml
+++ b/roles/custom/matrix-prometheus/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_prometheus_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-prometheus
+    - install-all
+    - install-prometheus

+- block:
    - when: not matrix_prometheus_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-redis/tasks/main.yml
+++ b/roles/custom/matrix-redis/tasks/main.yml
@ -3,7 +3,13 @@
 - block:
    - when: matrix_redis_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-redis
+    - install-all
+    - install-redis

+- block:
    - when: not matrix_redis_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-registration/tasks/main.yml
+++ b/roles/custom/matrix-registration/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_registration_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_registration_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-matrix-registration
+    - install-all
+    - install-matrix-registration

+- block:
    - when: not matrix_registration_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-sygnal/tasks/main.yml
+++ b/roles/custom/matrix-sygnal/tasks/main.yml
@ -6,7 +6,13 @@

    - when: matrix_sygnal_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-sygnal
+    - install-all
+    - install-sygnal

+- block:
    - when: not matrix_sygnal_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-synapse-admin/tasks/main.yml
+++ b/roles/custom/matrix-synapse-admin/tasks/main.yml
@ -6,6 +6,8 @@
  tags:
    - setup-all
    - setup-nginx-proxy
+    - install-all
+    - install-nginx-proxy

 - block:
    - when: matrix_synapse_admin_enabled | bool
@ -13,7 +15,13 @@

    - when: matrix_synapse_admin_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-synapse-admin
+    - install-all
+    - install-synapse-admin

+- block:
    - when: not matrix_synapse_admin_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-synapse-reverse-proxy-companion/tasks/main.yml
+++ b/roles/custom/matrix-synapse-reverse-proxy-companion/tasks/main.yml
@ -3,7 +3,15 @@
 - block:
    - when: matrix_synapse_reverse_proxy_companion_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-synapse-reverse-proxy-companion
+    - setup-synapse
+    - install-all
+    - install-synapse-reverse-proxy-companion
+    - install-synapse

+- block:
    - when: not matrix_synapse_reverse_proxy_companion_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix-synapse/tasks/main.yml
+++ b/roles/custom/matrix-synapse/tasks/main.yml
@ -22,7 +22,13 @@

    - when: matrix_synapse_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  tags:
+    - setup-all
+    - setup-synapse
+    - install-all
+    - install-synapse

+- block:
    - when: not matrix_synapse_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
  tags:
--- a/roles/custom/matrix_playbook_migration/tasks/main.yml
+++ b/roles/custom/matrix_playbook_migration/tasks/main.yml
@ -4,3 +4,4 @@
    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
  tags:
    - setup-all
+    - install-all