ソースを参照

Remove matrix_synapse_role_executed and various tasks that check it

This was useful when the order of these roles in relation to Synapse
mattered (when we were injecting stuff into Synapse variables during
runtime). This is no longer the case since 0ea7cb5d1812a88, so all of
this can be removed.
pull/2289/head
Slavi Pantaleev 3年前
コミット
07c23b7cb0
20個のファイルの変更0行の追加152行の削除
  1. +0
    -8
      roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml
  2. +0
    -7
      roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml
  3. +0
    -8
      roles/custom/matrix-bridge-go-skype-bridge/tasks/setup_install.yml
  4. +0
    -8
      roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml
  5. +0
    -8
      roles/custom/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
  6. +0
    -8
      roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml
  7. +0
    -8
      roles/custom/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
  8. +0
    -7
      roles/custom/matrix-bridge-mautrix-instagram/tasks/setup_install.yml
  9. +0
    -8
      roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml
  10. +0
    -8
      roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml
  11. +0
    -8
      roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml
  12. +0
    -8
      roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml
  13. +0
    -8
      roles/custom/matrix-bridge-mx-puppet-discord/tasks/setup_install.yml
  14. +0
    -8
      roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml
  15. +0
    -9
      roles/custom/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml
  16. +0
    -8
      roles/custom/matrix-bridge-mx-puppet-slack/tasks/setup_install.yml
  17. +0
    -8
      roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml
  18. +0
    -8
      roles/custom/matrix-bridge-mx-puppet-twitter/tasks/setup_install.yml
  19. +0
    -6
      roles/custom/matrix-synapse/tasks/main.yml
  20. +0
    -3
      roles/custom/matrix-synapse/vars/main.yml

+ 0
- 8
roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-matrix-appservice-kakaotalk role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- name: Ensure matrix-appservice-kakaotalk image is pulled
community.docker.docker_image:
name: "{{ matrix_appservice_kakaotalk_docker_image }}"


+ 0
- 7
roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml ファイルの表示

@@ -1,12 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-beeper-linkedin role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"
- name: Ensure Beeper LinkedIn paths exists
ansible.builtin.file:
path: "{{ item.path }}"


+ 0
- 8
roles/custom/matrix-bridge-go-skype-bridge/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-go-skype-bridge role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- ansible.builtin.set_fact:
matrix_go_skype_bridge_requires_restart: false



+ 0
- 8
roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mautrix-discord role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- ansible.builtin.set_fact:
matrix_mautrix_discord_requires_restart: false



+ 0
- 8
roles/custom/matrix-bridge-mautrix-facebook/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mautrix-facebook role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- ansible.builtin.set_fact:
matrix_mautrix_facebook_requires_restart: false



+ 0
- 8
roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mautrix-googlechat role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- ansible.builtin.set_fact:
matrix_mautrix_googlechat_requires_restart: false



+ 0
- 8
roles/custom/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mautrix-hangouts role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- ansible.builtin.set_fact:
matrix_mautrix_hangouts_requires_restart: false



+ 0
- 7
roles/custom/matrix-bridge-mautrix-instagram/tasks/setup_install.yml ファイルの表示

@@ -1,11 +1,4 @@
---
# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mautrix-instagram role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- name: Ensure Mautrix instagram image is pulled
community.docker.docker_image:


+ 0
- 8
roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mautrix-signal role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- name: Ensure Mautrix Signal image is pulled
community.docker.docker_image:
name: "{{ matrix_mautrix_signal_docker_image }}"


+ 0
- 8
roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mautrix-telegram role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- ansible.builtin.set_fact:
matrix_mautrix_telegram_requires_restart: false



+ 0
- 8
roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mautrix-twitter role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- ansible.builtin.set_fact:
matrix_mautrix_twitter_requires_restart: false



+ 0
- 8
roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mautrix-whatsapp role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- ansible.builtin.set_fact:
matrix_mautrix_whatsapp_requires_restart: false



+ 0
- 8
roles/custom/matrix-bridge-mx-puppet-discord/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mx-puppet-discord role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- name: Ensure MX Puppet Discord paths exist
ansible.builtin.file:
path: "{{ item.path }}"


+ 0
- 8
roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mx-puppet-groupme role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- name: Ensure MX Puppet Groupme paths exist
ansible.builtin.file:
path: "{{ item.path }}"


+ 0
- 9
roles/custom/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml ファイルの表示

@@ -1,14 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mx-puppet-instagram role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"


- ansible.builtin.set_fact:
matrix_mx_puppet_instagram_requires_restart: false



+ 0
- 8
roles/custom/matrix-bridge-mx-puppet-slack/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mx-puppet-slack role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- name: Ensure MX Puppet Slack paths exist
ansible.builtin.file:
path: "{{ item.path }}"


+ 0
- 8
roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mx-puppet-steam role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- name: Ensure MX Puppet Steam paths exist
ansible.builtin.file:
path: "{{ item.path }}"


+ 0
- 8
roles/custom/matrix-bridge-mx-puppet-twitter/tasks/setup_install.yml ファイルの表示

@@ -1,13 +1,5 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
ansible.builtin.fail:
msg: >-
The matrix-bridge-mx-puppet-twitter role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed | default(False)"

- name: Ensure MX Puppet Twitter paths exist
ansible.builtin.file:
path: "{{ item.path }}"


+ 0
- 6
roles/custom/matrix-synapse/tasks/main.yml ファイルの表示

@@ -60,9 +60,3 @@
when: run_synapse_rust_synapse_compress_state | bool
tags:
- rust-synapse-compress-state

- name: Mark matrix-synapse role as executed
ansible.builtin.set_fact:
matrix_synapse_role_executed: true
tags:
- always

+ 0
- 3
roles/custom/matrix-synapse/vars/main.yml ファイルの表示

@@ -3,9 +3,6 @@
matrix_synapse_client_api_url_endpoint_public: "https://{{ matrix_server_fqn_matrix }}/_matrix/client/versions"
matrix_synapse_federation_api_url_endpoint_public: "https://{{ matrix_server_fqn_matrix }}:{{ matrix_federation_public_port }}/_matrix/federation/v1/version"

# Tells whether this role had executed or not. Toggled to `true` during runtime.
matrix_synapse_role_executed: false

matrix_synapse_media_store_directory_name: "{{ matrix_synapse_media_store_path | basename }}"

# A Synapse generic worker can handle both federation and client-server API endpoints.


読み込み中…
キャンセル
保存