Merge branch 'spantaleev:master' into master

docs/configuring-playbook-dimension.md

@@ -22,7 +22,7 @@ matrix_dimension_enabled: true
 
 ## Define admin users
 
-These users can modify the integrations this Dimension supports. Admin interface is accessible at `https://dimension.<your-domain>/riot-app/admin` after logging in to element.
+These users can modify the integrations this Dimension supports. 
 Add this to your configuration file (`inventory/host_vars/matrix.<your-domain>/vars.yml`):
 
 ```yaml
@@ -31,6 +31,7 @@ matrix_dimension_admins:
   - "@user2:{{ matrix_domain }}"
 ```
 
+Admin interface is accessible at `https://dimension.<your-domain>/riot-app/admin` after logging in to element and opening it in any room via "Edit widgets, bridges & bots" and then clicking the "settings"-icon in the upper right corner.
 
 ## Access token
 

group_vars/matrix_servers

@@ -299,6 +299,10 @@ matrix_mautrix_facebook_appservice_token: "{{ '%s' | format(matrix_homeserver_ge
 
 matrix_mautrix_facebook_homeserver_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'fb.hs.token') | to_uuid }}"
 
+matrix_mautrix_facebook_public_endpoint: "/{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'facebook') | to_uuid }}"
+
+matrix_mautrix_facebook_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:9008' }}"
+
 matrix_mautrix_facebook_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}"
 
 matrix_mautrix_facebook_bridge_presence: "{{ matrix_synapse_presence_enabled if matrix_synapse_enabled else true }}"
@@ -2143,7 +2147,7 @@ matrix_prometheus_scraper_node_targets: "{{ ['matrix-prometheus-node-exporter:91
 matrix_prometheus_scraper_postgres_enabled: "{{ matrix_prometheus_postgres_exporter_enabled }}"
 matrix_prometheus_scraper_postgres_targets: "{{ ['matrix-prometheus-postgres-exporter:'+ matrix_prometheus_postgres_exporter_port|string] if matrix_prometheus_scraper_postgres_enabled else [] }}"
 
-matrix_prometheus_scraper_hookshot_enabled: "{{ matrix_hookshot_metrics_enabled }}"
+matrix_prometheus_scraper_hookshot_enabled: "{{ matrix_hookshot_metrics_enabled|default(false) }}"
 matrix_prometheus_scraper_hookshot_targets: "{{ [matrix_hookshot_container_url|string +':'+ matrix_hookshot_metrics_port|string] if matrix_hookshot_metrics_enabled else [] }}"
 
 ######################################################################

roles/matrix-bot-go-neb/tasks/setup_install.yml

@@ -25,7 +25,7 @@
 
 - name: Ensure go-neb config installed
   copy:
-    content: "{{ matrix_bot_go_neb_configuration|to_nice_yaml }}"
+    content: "{{ matrix_bot_go_neb_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_bot_go_neb_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml

@@ -70,7 +70,7 @@
 
 - name: Ensure matrix-reminder-bot config installed
   copy:
-    content: "{{ matrix_bot_matrix_reminder_bot_configuration|to_nice_yaml }}"
+    content: "{{ matrix_bot_matrix_reminder_bot_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_bot_matrix_reminder_bot_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bot-mjolnir/tasks/setup_install.yml

@@ -47,7 +47,7 @@
 
 - name: Ensure matrix-bot-mjolnir config installed
   copy:
-    content: "{{ matrix_bot_mjolnir_configuration|to_nice_yaml }}"
+    content: "{{ matrix_bot_mjolnir_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_bot_mjolnir_config_path }}/production.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-appservice-discord/tasks/setup_install.yml

@@ -69,7 +69,7 @@
 
 - name: Ensure AppService Discord config.yaml installed
   copy:
-    content: "{{ matrix_appservice_discord_configuration|to_nice_yaml }}"
+    content: "{{ matrix_appservice_discord_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_appservice_discord_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -77,7 +77,7 @@
 
 - name: Ensure AppService Discord registration.yaml installed
   copy:
-    content: "{{ matrix_appservice_discord_registration|to_nice_yaml }}"
+    content: "{{ matrix_appservice_discord_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_appservice_discord_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-appservice-irc/tasks/setup_install.yml

@@ -87,7 +87,7 @@
 
 - name: Ensure Matrix Appservice IRC config installed
   copy:
-    content: "{{ matrix_appservice_irc_configuration|to_nice_yaml }}"
+    content: "{{ matrix_appservice_irc_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_appservice_irc_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -171,7 +171,7 @@
 
 - name: Ensure Appservice IRC registration.yaml installed
   copy:
-    content: "{{ matrix_appservice_irc_registration|to_nice_yaml }}"
+    content: "{{ matrix_appservice_irc_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_appservice_irc_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-appservice-slack/tasks/init.yml

@@ -84,4 +84,4 @@
       Please make sure that you're proxying the `{{ something }}`
       URL endpoint to the matrix-appservice-slack container.
       You can expose the container's port using the `matrix_appservice_slack_container_http_host_bind_port` variable.
-  when: "matrix_appservice_slack_enabled|bool and matrix_nginx_proxy_enabled is not defined"
+  when: "matrix_appservice_slack_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"

roles/matrix-bridge-appservice-slack/tasks/setup_install.yml

@@ -61,7 +61,7 @@
 
 - name: Ensure Matrix Appservice Slack config installed
   copy:
-    content: "{{ matrix_appservice_slack_configuration|to_nice_yaml }}"
+    content: "{{ matrix_appservice_slack_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_appservice_slack_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -69,7 +69,7 @@
 
 - name: Ensure appservice-slack registration.yaml installed
   copy:
-    content: "{{ matrix_appservice_slack_registration|to_nice_yaml }}"
+    content: "{{ matrix_appservice_slack_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_appservice_slack_config_path }}/slack-registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-appservice-webhooks/tasks/init.yml

@@ -79,4 +79,4 @@
       Please make sure that you're proxying the `{{ matrix_appservice_webhooks_public_endpoint }}`
       URL endpoint to the matrix-appservice-webhooks container.
       You can expose the container's port using the `matrix_appservice_webhooks_container_http_host_bind_port` variable.
-  when: "matrix_appservice_webhooks_enabled|bool and matrix_nginx_proxy_enabled is not defined"
+  when: "matrix_appservice_webhooks_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"

roles/matrix-bridge-appservice-webhooks/tasks/setup_install.yml

@@ -45,7 +45,7 @@
 
 - name: Ensure Matrix Appservice webhooks config is installed
   copy:
-    content: "{{ matrix_appservice_webhooks_configuration|to_nice_yaml }}"
+    content: "{{ matrix_appservice_webhooks_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_appservice_webhooks_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -69,7 +69,7 @@
 
 - name: Ensure appservice-webhooks registration.yaml installed
   copy:
-    content: "{{ matrix_appservice_webhooks_registration|to_nice_yaml }}"
+    content: "{{ matrix_appservice_webhooks_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_appservice_webhooks_config_path }}/webhooks-registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-beeper-linkedin/tasks/setup_install.yml

@@ -67,7 +67,7 @@
 
 - name: Ensure beeper-linkedin config.yaml installed
   copy:
-    content: "{{ matrix_beeper_linkedin_configuration|to_nice_yaml }}"
+    content: "{{ matrix_beeper_linkedin_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_beeper_linkedin_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -75,7 +75,7 @@
 
 - name: Ensure beeper-linkedin registration.yaml installed
   copy:
-    content: "{{ matrix_beeper_linkedin_registration|to_nice_yaml }}"
+    content: "{{ matrix_beeper_linkedin_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_beeper_linkedin_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-heisenbridge/tasks/setup_install.yml

@@ -19,7 +19,7 @@
 
 - name: Ensure heisenbridge registration.yaml installed if provided
   copy:
-    content: "{{ matrix_heisenbridge_registration|to_nice_yaml }}"
+    content: "{{ matrix_heisenbridge_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_heisenbridge_base_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-hookshot/tasks/init.yml

@@ -127,4 +127,4 @@
       Please make sure that you're proxying the `{{ matrix_hookshot_public_endpoint }}`
       URL endpoint to the matrix-hookshot container.
       You can expose the container's ports using the `matrix_hookshot_container_http_host_bind_ports` variable.
-  when: "matrix_hookshot_enabled|bool and matrix_nginx_proxy_enabled is not defined"
+  when: "matrix_hookshot_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"

roles/matrix-bridge-hookshot/tasks/setup_install.yml

@@ -32,7 +32,7 @@
 
 - name: Ensure hookshot config.yml installed if provided
   copy:
-    content: "{{ matrix_hookshot_configuration|to_nice_yaml }}"
+    content: "{{ matrix_hookshot_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_hookshot_base_path }}/config.yml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -56,7 +56,7 @@
 
 - name: Ensure hookshot registration.yml installed if provided
   copy:
-    content: "{{ matrix_hookshot_registration|to_nice_yaml }}"
+    content: "{{ matrix_hookshot_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_hookshot_base_path }}/registration.yml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mautrix-facebook/defaults/main.yml

@@ -17,9 +17,16 @@ matrix_mautrix_facebook_config_path: "{{ matrix_mautrix_facebook_base_path }}/co
 matrix_mautrix_facebook_data_path: "{{ matrix_mautrix_facebook_base_path }}/data"
 matrix_mautrix_facebook_docker_src_files_path: "{{ matrix_mautrix_facebook_base_path }}/docker-src"
 
+# Whether or not the public-facing endpoints should be enabled (web-based login)
+matrix_mautrix_facebook_appservice_public_enabled: true
+
+# Mautrix Facebook public endpoint to log in to Facebook
+matrix_mautrix_facebook_public_endpoint: ''
+
 matrix_mautrix_facebook_homeserver_address: "{{ matrix_homeserver_container_url }}"
 matrix_mautrix_facebook_homeserver_domain: '{{ matrix_domain }}'
 matrix_mautrix_facebook_appservice_address: 'http://matrix-mautrix-facebook:29319'
+matrix_mautrix_facebook_appservice_public_external: 'https://{{ matrix_server_fqn_matrix }}{{ matrix_mautrix_facebook_public_endpoint }}'
 
 # A list of extra arguments to pass to the container
 matrix_mautrix_facebook_container_extra_arguments: []
@@ -37,6 +44,11 @@ matrix_mautrix_facebook_homeserver_token: ''
 # If false, created portal rooms will never be federated.
 matrix_mautrix_facebook_federate_rooms: true
 
+# Controls whether the matrix-mautrix-facebook container exposes its HTTP port.
+#
+# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:9008"), or empty string to not expose.
+matrix_mautrix_facebook_container_http_host_bind_port: ''
+
 # Database-related configuration fields.
 #
 # To use SQLite:

roles/matrix-bridge-mautrix-facebook/tasks/init.yml

@@ -22,3 +22,51 @@
       +
       {{ ["/matrix-mautrix-facebook-registration.yaml"] }}
   when: matrix_mautrix_facebook_enabled|bool
+
+- block:
+    - name: Fail if matrix-nginx-proxy role already executed
+      fail:
+        msg: >-
+          Trying to append Mautrix Facebook's reverse-proxying configuration to matrix-nginx-proxy,
+          but it's pointless since the matrix-nginx-proxy role had already executed.
+          To fix this, please change the order of roles in your playbook,
+          so that the matrix-nginx-proxy role would run after the matrix-bridge-mautrix-facebook role.
+      when: matrix_nginx_proxy_role_executed|default(False)|bool
+
+    - name: Generate Mautrix Facebook proxying configuration for matrix-nginx-proxy
+      set_fact:
+        matrix_mautrix_facebook_matrix_nginx_proxy_configuration: |
+          location {{ matrix_mautrix_facebook_public_endpoint }} {
+          {% if matrix_nginx_proxy_enabled|default(False) %}
+              {# Use the embedded DNS resolver in Docker containers to discover the service #}
+              resolver 127.0.0.11 valid=5s;
+              set $backend "matrix-mautrix-facebook:29319";
+              proxy_pass http://$backend;
+          {% else %}
+              {# Generic configuration for use outside of our container setup #}
+              proxy_pass http://127.0.0.1:9008;
+          {% endif %}
+          }
+
+    - name: Register Mautrix Facebook proxying configuration with matrix-nginx-proxy
+      set_fact:
+        matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
+          {{
+            matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks|default([])
+            +
+            [matrix_mautrix_facebook_matrix_nginx_proxy_configuration]
+          }}
+
+    - name: Warn about reverse-proxying if matrix-nginx-proxy not used
+      debug:
+        msg: >-
+          NOTE: You've enabled the Mautrix Facebook bridge but are not using the matrix-nginx-proxy
+          reverse proxy.
+          Please make sure that you're proxying the `{{ matrix_mautrix_facebook_public_endpoint }}`
+          URL endpoint to the matrix-mautrix-facebook container.
+          You can expose the container's port using the `matrix_mautrix_facebook_container_http_host_bind_port` variable.
+      when: "not matrix_nginx_proxy_enabled|default(False)|bool"
+
+  tags:
+    - always
+  when: matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_appservice_public_enabled|bool

roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml

@@ -97,7 +97,7 @@
 
 - name: Ensure mautrix-facebook config.yaml installed
   copy:
-    content: "{{ matrix_mautrix_facebook_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_facebook_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_facebook_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -105,7 +105,7 @@
 
 - name: Ensure mautrix-facebook registration.yaml installed
   copy:
-    content: "{{ matrix_mautrix_facebook_registration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_facebook_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_facebook_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mautrix-facebook/tasks/validate_config.yml

@@ -6,6 +6,7 @@
       You need to define a required configuration setting (`{{ item }}`).
   when: "vars[item] == ''"
   with_items:
+    - "matrix_mautrix_facebook_public_endpoint"
     - "matrix_mautrix_facebook_appservice_token"
     - "matrix_mautrix_facebook_homeserver_token"
 

roles/matrix-bridge-mautrix-facebook/templates/config.yaml.j2

@@ -32,16 +32,12 @@ appservice:
     # Public part of web server for out-of-Matrix interaction with the bridge.
     public:
         # Whether or not the public-facing endpoints should be enabled.
-        enabled: false
+        enabled: {{ matrix_mautrix_facebook_appservice_public_enabled|to_json }}
         # The prefix to use in the public-facing endpoints.
-        prefix: /public
+        prefix: {{ matrix_mautrix_facebook_public_endpoint|to_json }}
         # The base URL where the public-facing endpoints are available. The prefix is not added
         # implicitly.
-        external: https://example.com/public
+        external: {{ matrix_mautrix_facebook_appservice_public_external|to_json }}
-        # Shared secret for integration managers such as mautrix-manager.
-        # If set to "generate", a random string will be generated on the next startup.
-        # If null, integration manager access to the API will not be possible.
-        shared_secret: generate
 
     # The unique ID of this appservice.
     id: facebook
@@ -176,7 +172,7 @@ bridge:
     # Whether or not temporary disconnections should send notices to the notice room.
     # If this is false, disconnections will never send messages and connections will only send
     # messages if it was disconnected for more than resync_max_disconnected_time seconds.
-    temporary_disconnect_notices: true
+    temporary_disconnect_notices: false
     # Whether or not the bridge should try to "refresh" the connection if a normal reconnection
     # attempt fails.
     refresh_on_reconnection_fail: false

roles/matrix-bridge-mautrix-facebook/templates/systemd/matrix-mautrix-facebook.service.j2

@@ -24,6 +24,9 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-mautrix-facebo
 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
 			--cap-drop=ALL \
 			--network={{ matrix_docker_network }} \
+			{% if matrix_mautrix_facebook_appservice_public_enabled and matrix_mautrix_facebook_container_http_host_bind_port %}
+			-p {{ matrix_mautrix_facebook_container_http_host_bind_port }}:29319 \
+			{% endif %}
 			-v {{ matrix_mautrix_facebook_config_path }}:/config:z \
 			-v {{ matrix_mautrix_facebook_data_path }}:/data:z \
 			{% for arg in matrix_mautrix_facebook_container_extra_arguments %}

roles/matrix-bridge-mautrix-googlechat/tasks/init.yml

@@ -67,4 +67,4 @@
       Please make sure that you're proxying the `{{ matrix_mautrix_googlechat_public_endpoint }}`
       URL endpoint to the matrix-mautrix-googlechat container.
       You can expose the container's port using the `matrix_mautrix_googlechat_container_http_host_bind_port` variable.
-  when: "matrix_mautrix_googlechat_enabled|bool and (matrix_nginx_proxy_enabled is not defined or matrix_nginx_proxy_enabled|bool == false)"
+  when: "matrix_mautrix_googlechat_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"

roles/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml

@@ -96,7 +96,7 @@
 
 - name: Ensure mautrix-googlechat config.yaml installed
   copy:
-    content: "{{ matrix_mautrix_googlechat_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_googlechat_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_googlechat_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -104,7 +104,7 @@
 
 - name: Ensure mautrix-googlechat registration.yaml installed
   copy:
-    content: "{{ matrix_mautrix_googlechat_registration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_googlechat_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_googlechat_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mautrix-hangouts/tasks/init.yml

@@ -67,4 +67,4 @@
       Please make sure that you're proxying the `{{ matrix_mautrix_hangouts_public_endpoint }}`
       URL endpoint to the matrix-mautrix-hangouts container.
       You can expose the container's port using the `matrix_mautrix_hangouts_container_http_host_bind_port` variable.
-  when: "matrix_mautrix_hangouts_enabled|bool and (matrix_nginx_proxy_enabled is not defined or matrix_nginx_proxy_enabled|bool == false)"
+  when: "matrix_mautrix_hangouts_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"

roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml

@@ -96,7 +96,7 @@
 
 - name: Ensure mautrix-hangouts config.yaml installed
   copy:
-    content: "{{ matrix_mautrix_hangouts_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_hangouts_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_hangouts_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -104,7 +104,7 @@
 
 - name: Ensure mautrix-hangouts registration.yaml installed
   copy:
-    content: "{{ matrix_mautrix_hangouts_registration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_hangouts_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_hangouts_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mautrix-instagram/tasks/setup_install.yml

@@ -51,7 +51,7 @@
 
 - name: Ensure mautrix-instagram config.yaml installed
   copy:
-    content: "{{ matrix_mautrix_instagram_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_instagram_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_instagram_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -59,7 +59,7 @@
 
 - name: Ensure mautrix-instagram registration.yaml installed
   copy:
-    content: "{{ matrix_mautrix_instagram_registration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_instagram_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_instagram_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mautrix-signal/tasks/setup_install.yml

@@ -84,7 +84,7 @@
 
 - name: Ensure mautrix-signal config.yaml installed
   copy:
-    content: "{{ matrix_mautrix_signal_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_signal_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_signal_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -92,7 +92,7 @@
 
 - name: Ensure mautrix-signal registration.yaml installed
   copy:
-    content: "{{ matrix_mautrix_signal_registration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_signal_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_signal_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mautrix-telegram/defaults/main.yml

@@ -28,6 +28,9 @@ matrix_mautrix_telegram_api_id: ''
 matrix_mautrix_telegram_api_hash: ''
 matrix_mautrix_telegram_bot_token: disabled
 
+# Whether or not the public-facing endpoints should be enabled (web-based login)
+matrix_mautrix_telegram_appservice_public_enabled: true
+
 # Mautrix telegram public endpoint to log in to telegram
 # Use an uuid so it's not easily discoverable.
 # Example: /741a0483-ba17-4682-9900-30bd7269f1cc

roles/matrix-bridge-mautrix-telegram/tasks/init.yml

@@ -56,16 +56,16 @@
             +
             [matrix_mautrix_telegram_matrix_nginx_proxy_configuration]
           }}
+    - name: Warn about reverse-proxying if matrix-nginx-proxy not used
+      debug:
+        msg: >-
+          NOTE: You've enabled the Mautrix Telegram bridge but are not using the matrix-nginx-proxy
+          reverse proxy.
+          Please make sure that you're proxying the `{{ matrix_mautrix_telegram_public_endpoint }}`
+          URL endpoint to the matrix-mautrix-telegram container.
+          You can expose the container's port using the `matrix_mautrix_telegram_container_http_host_bind_port` variable.
+      when: "not matrix_nginx_proxy_enabled|default(False)|bool"
+
   tags:
     - always
-  when: matrix_mautrix_telegram_enabled|bool
+  when: matrix_mautrix_telegram_enabled|bool and matrix_mautrix_telegram_appservice_public_enabled|bool
-
-- name: Warn about reverse-proxying if matrix-nginx-proxy not used
-  debug:
-    msg: >-
-      NOTE: You've enabled the Mautrix Telegram bridge but are not using the matrix-nginx-proxy
-      reverse proxy.
-      Please make sure that you're proxying the `{{ matrix_mautrix_telegram_public_endpoint }}`
-      URL endpoint to the matrix-mautrix-telegram container.
-      You can expose the container's port using the `matrix_mautrix_telegram_container_http_host_bind_port` variable.
-  when: "matrix_mautrix_telegram_enabled|bool and matrix_nginx_proxy_enabled is not defined"

roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml

@@ -118,7 +118,7 @@
 
 - name: Ensure mautrix-telegram config.yaml installed
   copy:
-    content: "{{ matrix_mautrix_telegram_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_telegram_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_telegram_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -126,7 +126,7 @@
 
 - name: Ensure mautrix-telegram registration.yaml installed
   copy:
-    content: "{{ matrix_mautrix_telegram_registration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_telegram_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_telegram_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mautrix-telegram/templates/config.yaml.j2

@@ -34,7 +34,7 @@ appservice:
     # the HS database.
     public:
         # Whether or not the public-facing endpoints should be enabled.
-        enabled: true
+        enabled: {{ matrix_mautrix_telegram_appservice_public_enabled|to_json }}
         # The prefix to use in the public-facing endpoints.
         prefix: {{ matrix_mautrix_telegram_public_endpoint|to_json }}
         # The base URL where the public-facing endpoints are available. The prefix is not added

roles/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2

@@ -24,7 +24,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-mautrix-telegr
 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
 			--cap-drop=ALL \
 			--network={{ matrix_docker_network }} \
-			{% if matrix_mautrix_telegram_container_http_host_bind_port %}
+			{% if matrix_mautrix_telegram_appservice_public_enabled and matrix_mautrix_telegram_container_http_host_bind_port %}
 			-p {{ matrix_mautrix_telegram_container_http_host_bind_port }}:8080 \
 			{% endif %}
 			-v {{ matrix_mautrix_telegram_config_path }}:/config:z \

roles/matrix-bridge-mautrix-twitter/tasks/setup_install.yml

@@ -55,7 +55,7 @@
 
 - name: Ensure mautrix-twitter config.yaml installed
   copy:
-    content: "{{ matrix_mautrix_twitter_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_twitter_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_twitter_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -63,7 +63,7 @@
 
 - name: Ensure mautrix-twitter registration.yaml installed
   copy:
-    content: "{{ matrix_mautrix_twitter_registration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_twitter_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_twitter_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml

@@ -108,7 +108,7 @@
 
 - name: Ensure mautrix-whatsapp config.yaml installed
   copy:
-    content: "{{ matrix_mautrix_whatsapp_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_whatsapp_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_whatsapp_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -116,7 +116,7 @@
 
 - name: Ensure mautrix-whatsapp registration.yaml installed
   copy:
-    content: "{{ matrix_mautrix_whatsapp_registration|to_nice_yaml }}"
+    content: "{{ matrix_mautrix_whatsapp_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mautrix_whatsapp_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mx-puppet-discord/tasks/setup_install.yml

@@ -96,7 +96,7 @@
 
 - name: Ensure mx-puppet-discord config.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_discord_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_discord_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_discord_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -104,7 +104,7 @@
 
 - name: Ensure mx-puppet-discord discord-registration.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_discord_registration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_discord_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_discord_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml

@@ -96,7 +96,7 @@
 
 - name: Ensure mx-puppet-groupme config.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_groupme_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_groupme_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_groupme_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -104,7 +104,7 @@
 
 - name: Ensure mx-puppet-groupme groupme-registration.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_groupme_registration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_groupme_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_groupme_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml

@@ -79,7 +79,7 @@
 
 - name: Ensure mx-puppet-instagram config.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_instagram_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_instagram_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_instagram_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -87,7 +87,7 @@
 
 - name: Ensure mx-puppet-instagram-registration.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_instagram_registration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_instagram_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_instagram_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mx-puppet-skype/tasks/setup_install.yml

@@ -96,7 +96,7 @@
 
 - name: Ensure mx-puppet-skype config.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_skype_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_skype_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_skype_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -104,7 +104,7 @@
 
 - name: Ensure mx-puppet-skype skype-registration.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_skype_registration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_skype_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_skype_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mx-puppet-slack/tasks/init.yml

@@ -68,4 +68,4 @@
       Please make sure that you're proxying the `{{ matrix_mx_puppet_slack_redirect_path }}`
       URL endpoint to the matrix-mx-puppet-slack container.
       You can expose the container's port using the `matrix_appservice_slack_container_http_host_bind_port` variable.
-  when: "matrix_mx_puppet_slack_enabled|bool and matrix_nginx_proxy_enabled is not defined"
+  when: "matrix_mx_puppet_slack_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"

roles/matrix-bridge-mx-puppet-slack/tasks/setup_install.yml

@@ -96,7 +96,7 @@
 
 - name: Ensure mx-puppet-slack config.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_slack_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_slack_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_slack_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -104,7 +104,7 @@
 
 - name: Ensure mx-puppet-slack slack-registration.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_slack_registration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_slack_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_slack_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml

@@ -96,7 +96,7 @@
 
 - name: Ensure mx-puppet-steam config.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_steam_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_steam_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_steam_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -104,7 +104,7 @@
 
 - name: Ensure mx-puppet-steam steam-registration.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_steam_registration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_steam_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_steam_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-mx-puppet-twitter/tasks/init.yml

@@ -68,4 +68,4 @@
       Please make sure that you're proxying the `{{ matrix_mx_puppet_twitter_redirect_path }}`
       URL endpoint to the matrix-mx-puppet-twitter container.
       You can expose the container's port using the `matrix_mx_puppet_twitter_container_http_host_bind_port` variable.
-  when: "matrix_mx_puppet_twitter_enabled|bool and matrix_nginx_proxy_enabled is not defined"
+  when: "matrix_mx_puppet_twitter_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"

roles/matrix-bridge-mx-puppet-twitter/tasks/setup_install.yml

@@ -96,7 +96,7 @@
 
 - name: Ensure mx-puppet-twitter config.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_twitter_configuration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_twitter_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_twitter_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -104,7 +104,7 @@
 
 - name: Ensure mx-puppet-twitter twitter-registration.yaml installed
   copy:
-    content: "{{ matrix_mx_puppet_twitter_registration|to_nice_yaml }}"
+    content: "{{ matrix_mx_puppet_twitter_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_mx_puppet_twitter_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-bridge-sms/tasks/setup_install.yml

@@ -19,7 +19,7 @@
 
 - name: Ensure matrix-sms-bridge application.yml installed
   copy:
-    content: "{{ matrix_sms_bridge_configuration|to_nice_yaml }}"
+    content: "{{ matrix_sms_bridge_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_sms_bridge_config_path }}/application.yml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
@@ -27,7 +27,7 @@
 
 - name: Ensure matrix-sms-bridge registration.yaml installed
   copy:
-    content: "{{ matrix_sms_bridge_registration|to_nice_yaml }}"
+    content: "{{ matrix_sms_bridge_registration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_sms_bridge_config_path }}/registration.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-client-cinny/defaults/main.yml

@@ -5,7 +5,7 @@ matrix_client_cinny_enabled: true
 matrix_client_cinny_container_image_self_build: false
 matrix_client_cinny_container_image_self_build_repo: "https://github.com/ajbura/cinny.git"
 
-matrix_client_cinny_version: v1.8.0
+matrix_client_cinny_version: v1.8.1
 matrix_client_cinny_docker_image: "{{ matrix_client_cinny_docker_image_name_prefix }}ajbura/cinny:{{ matrix_client_cinny_version }}"
 matrix_client_cinny_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_cinny_container_image_self_build else matrix_container_global_registry_prefix }}"
 matrix_client_cinny_docker_image_force_pull: "{{ matrix_client_cinny_docker_image.endswith(':latest') }}"

roles/matrix-client-element/defaults/main.yml

@@ -9,7 +9,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/vecto
 # - https://github.com/vector-im/element-web/issues/19544
 matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_memtotal_mb < 4096 }}"
 
-matrix_client_element_version: v1.10.6
+matrix_client_element_version: v1.10.7
 matrix_client_element_docker_image: "{{ matrix_client_element_docker_image_name_prefix }}vectorim/element-web:{{ matrix_client_element_version }}"
 matrix_client_element_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_container_global_registry_prefix }}"
 matrix_client_element_docker_image_force_pull: "{{ matrix_client_element_docker_image.endswith(':latest') }}"

roles/matrix-dendrite/tasks/dendrite/setup_install.yml

@@ -52,7 +52,7 @@
 
 - name: Ensure Dendrite configuration installed
   copy:
-    content: "{{ matrix_dendrite_configuration|to_nice_yaml }}"
+    content: "{{ matrix_dendrite_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_dendrite_config_dir_path }}/dendrite.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-dimension/tasks/setup_install.yml

@@ -78,7 +78,7 @@
 
 - name: Ensure Dimension config installed
   copy:
-    content: "{{ matrix_dimension_configuration|to_nice_yaml }}"
+    content: "{{ matrix_dimension_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_dimension_base_path }}/config.yaml"
     mode: 0640
     owner: "{{ matrix_user_username }}"

roles/matrix-etherpad/tasks/init.yml

@@ -61,4 +61,4 @@
       Please make sure that you're proxying the `{{ matrix_etherpad_public_endpoint }}`
       URL endpoint to the matrix-etherpad container.
       You can expose the container's port using the `matrix_etherpad_container_http_host_bind_port` variable.
-  when: "matrix_etherpad_enabled|bool and matrix_nginx_proxy_enabled is not defined"
+  when: "matrix_etherpad_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"

roles/matrix-ma1sd/tasks/setup_install.yml

@@ -87,6 +87,7 @@
       shell: "DOCKER_BUILDKIT=1 ./gradlew dockerBuild"
       args:
         chdir: "{{ matrix_ma1sd_docker_src_files_path }}"
+      when: matrix_ma1sd_git_pull_results.changed
 
     - name: Ensure ma1sd Docker image is tagged correctly
       docker_image:
@@ -104,7 +105,7 @@
 
 - name: Ensure ma1sd config installed
   copy:
-    content: "{{ matrix_ma1sd_configuration|to_nice_yaml }}"
+    content: "{{ matrix_ma1sd_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_ma1sd_config_path }}/ma1sd.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-prometheus/tasks/setup_install.yml

@@ -31,7 +31,7 @@
 
 - name: Ensure prometheus.yml installed
   copy:
-    content: "{{ matrix_prometheus_configuration|to_nice_yaml }}"
+    content: "{{ matrix_prometheus_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_prometheus_config_path }}/prometheus.yml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-registration/tasks/init.yml

@@ -66,4 +66,4 @@
       Please make sure that you're proxying the `{{ matrix_registration_public_endpoint }}`
       URL endpoint to the matrix-registration container.
       You can expose the container's port using the `matrix_registration_container_http_host_bind_port` variable.
-  when: "matrix_registration_enabled|bool and matrix_nginx_proxy_enabled is not defined"
+  when: "matrix_registration_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"

roles/matrix-registration/tasks/setup_install.yml

@@ -76,7 +76,7 @@
 
 - name: Ensure matrix-registration config installed
   copy:
-    content: "{{ matrix_registration_configuration|to_nice_yaml }}"
+    content: "{{ matrix_registration_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_registration_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-sygnal/tasks/setup_install.yml

@@ -21,7 +21,7 @@
 
 - name: Ensure Sygnal config installed
   copy:
-    content: "{{ matrix_sygnal_configuration|to_nice_yaml }}"
+    content: "{{ matrix_sygnal_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_sygnal_config_path }}/sygnal.yaml"
     mode: 0640
     owner: "{{ matrix_user_username }}"

roles/matrix-synapse-admin/tasks/init.yml

@@ -57,4 +57,4 @@
       Please make sure that you're proxying the `{{ matrix_synapse_admin_public_endpoint }}`
       URL endpoint to the matrix-synapse-admin container.
       You can expose the container's port using the `matrix_synapse_admin_container_http_host_bind_port` variable.
-  when: "matrix_synapse_admin_enabled|bool and matrix_nginx_proxy_enabled is not defined"
+  when: "matrix_synapse_admin_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"

roles/matrix-synapse/tasks/synapse/setup_install.yml

@@ -84,7 +84,7 @@
 
 - name: Ensure Synapse homeserver config installed
   copy:
-    content: "{{ matrix_synapse_configuration|to_nice_yaml }}"
+    content: "{{ matrix_synapse_configuration|to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_synapse_config_dir_path }}/homeserver.yaml"
     mode: 0644
     owner: "{{ matrix_user_username }}"

roles/matrix-synapse/templates/synapse/homeserver.yaml.j2

@@ -1414,7 +1414,7 @@ account_threepid_delegates:
 #  - "#example:example.com"
 {% if matrix_synapse_auto_join_rooms|length > 0 %}
 auto_join_rooms:
-{{ matrix_synapse_auto_join_rooms|to_nice_yaml }}
+{{ matrix_synapse_auto_join_rooms|to_nice_yaml(indent=2, width=999999) }}
 {% endif %}
 
 # Where auto_join_rooms are specified, setting this flag ensures that the

roles/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2

@@ -43,7 +43,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-synapse \
 			{% if matrix_synapse_federation_enabled and matrix_synapse_tls_federation_listener_enabled and matrix_synapse_container_federation_api_tls_host_bind_port %}
 			-p {{ matrix_synapse_container_federation_api_tls_host_bind_port }}:{{ matrix_synapse_container_federation_api_tls_port }} \
 			{% endif %}
-			{% if matrix_synapse_federation_enabled and matrix_synapse_container_federation_api_plain_host_bind_port %}
+			{% if matrix_synapse_federation_enabled and matrix_synapse_federation_port_enabled and matrix_synapse_container_federation_api_plain_host_bind_port %}
 			-p {{ matrix_synapse_container_federation_api_plain_host_bind_port }}:{{ matrix_synapse_container_federation_api_plain_port }} \
 			{% endif %}
 			{% if matrix_synapse_metrics_enabled and matrix_synapse_container_metrics_api_host_bind_port %}