diff --git a/docs/configuring-playbook-federation.md b/docs/configuring-playbook-federation.md index 65d3ebe43..546569644 100644 --- a/docs/configuring-playbook-federation.md +++ b/docs/configuring-playbook-federation.md @@ -44,7 +44,7 @@ matrix_homeserver_federation_enabled: false With that, your server's users will only be able to talk among themselves, but not to anyone who is on another server. -**Disabling federation does not necessarily disable the federation port** (`8448`). Services like [Dimension](configuring-playbook-dimension.md) normally rely on `openid` APIs exposed on that port. Even if you disable federation and only if necessary, we may still be exposing the federation port and serving the `openid` APIs there. To override this and completely disable Synapse's federation port use: +**Disabling federation does not necessarily disable the federation port** (`8448`). Even if you disable federation and only if necessary, we may still be exposing the federation port and serving the `openid` APIs there. To override this and completely disable Synapse's federation port use: ```yaml matrix_homeserver_federation_enabled: false diff --git a/docs/self-building.md b/docs/self-building.md index 613a8ed0e..64870ef02 100644 --- a/docs/self-building.md +++ b/docs/self-building.md @@ -33,7 +33,6 @@ Possibly outdated list of roles where self-building the Docker image is currentl - `matrix-registration` - `coturn` - `matrix-corporal` -- `matrix-dimension` - `exim-relay` - `matrix-bridge-hookshot` - `matrix-bridge-appservice-irc` diff --git a/examples/reverse-proxies/apache/README.md b/examples/reverse-proxies/apache/README.md index 89b6fde58..6e3dd3871 100644 --- a/examples/reverse-proxies/apache/README.md +++ b/examples/reverse-proxies/apache/README.md @@ -19,4 +19,4 @@ To get started, first follow the [front the integrated reverse-proxy webserver w `matrix-domain.conf` contains configuration for the Matrix domain, which handles both the Client-Server API (port `443`) and the Matrix Federation API (port `8448`). `matrix-client-element.conf` is an example for when you're hosting Element Web at `element.example.com`. -This configuration can also be used as an example for handling other domains, depending on the services you enable with the playbook (e.g. `dimension.example.com`, etc). +This configuration can also be used as an example for handling other domains, depending on the services you enable with the playbook (e.g. `etherpad.example.com`, etc). diff --git a/examples/reverse-proxies/nginx/README.md b/examples/reverse-proxies/nginx/README.md index 9ca86c86a..c78ae427b 100644 --- a/examples/reverse-proxies/nginx/README.md +++ b/examples/reverse-proxies/nginx/README.md @@ -22,4 +22,4 @@ Copy the [matrix.conf](matrix.conf) file to your nginx server's filesystem, modi This configuration **disables SSL certificate retrieval**, so you will **need to obtain SSL certificates manually** (e.g. by using [certbot](https://certbot.eff.org/)) and set the appropriate path in `matrix.conf`. In the example nginx configuration, a single certificate is used for all subdomains (`matrix.example.com`, `element.example.com`, etc.). For your setup, may wish to change this and use separate `server` blocks and separate certificate files for each host. -Also note that your copy of the `matrix.conf` file has to be adapted to whatever services you are using. For example, remove `element.example.com` from the `server_name` list if you don't use [Element Web](../../../docs/configuring-playbook-client-element-web.md) client or add `dimension.example.com` to it if you do use the [Dimension](../../../docs/configuring-playbook-dimension.md) integration manager. +Also note that your copy of the `matrix.conf` file has to be adapted to whatever services you are using. For example, remove `element.example.com` from the `server_name` list if you don't use [Element Web](../../../docs/configuring-playbook-client-element-web.md) client or add `etherpad.example.com` to it if you do use [Etherpad](../../../docs/configuring-playbook-etherpad.md). diff --git a/examples/reverse-proxies/nginx/matrix.conf b/examples/reverse-proxies/nginx/matrix.conf index 8e6c89711..69b32eb6f 100644 --- a/examples/reverse-proxies/nginx/matrix.conf +++ b/examples/reverse-proxies/nginx/matrix.conf @@ -19,7 +19,7 @@ server { # TODO: add/remove services and their subdomains if you use/don't use them # this example is using hosting something on the base domain and an Element Web client, so example.com and element.example.com are listed in addition to matrix.example.com # if you don't use those, you can remove them - # if you use e.g. Dimension on dimension.example.com, add dimension.example.com to the server_name list + # if you use e.g. Etherpad on etherpad.example.com, add etherpad.example.com to the server_name list server_name example.com matrix.example.com element.example.com; location / { diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 12940fe39..96a72138d 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -375,8 +375,6 @@ devture_systemd_service_manager_services_list_auto: | + ([{'name': (coturn_identifier + '-reload.timer'), 'priority': 5000, 'groups': ['matrix', 'coturn']}] if (coturn_enabled and coturn_tls_enabled) else []) + - ([{'name': 'matrix-dimension.service', 'priority': 4000, 'groups': ['matrix', 'integration-managers', 'dimension']}] if matrix_dimension_enabled else []) - + ([{'name': (ddclient_identifier + '.service'), 'priority': 5000, 'groups': ['matrix', 'ddclient', 'dynamic-dns']}] if ddclient_enabled else []) + ([{'name': (etherpad_identifier + '.service'), 'priority': 4000, 'groups': ['matrix', 'etherpad']}] if etherpad_enabled else []) @@ -546,8 +544,8 @@ matrix_homeserver_container_federation_api_endpoint: |- }[matrix_homeserver_implementation] }} -matrix_integration_manager_rest_url: "{{ matrix_dimension_integrations_rest_url if matrix_dimension_enabled else None }}" -matrix_integration_manager_ui_url: "{{ matrix_dimension_integrations_ui_url if matrix_dimension_enabled else None }}" +matrix_integration_manager_rest_url: "" +matrix_integration_manager_ui_url: "" ###################################################################### # @@ -3186,75 +3184,6 @@ coturn_systemd_required_services_list_auto: | # ###################################################################### -###################################################################### -# -# matrix-dimension -# -###################################################################### - -matrix_dimension_enabled: false - -matrix_dimension_scheme: "{{ 'https' if matrix_playbook_ssl_enabled else 'http' }}" -matrix_dimension_hostname: "{{ matrix_server_fqn_dimension }}" - -matrix_dimension_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_dimension_docker_image_registry_prefix_upstream_default }}" - -matrix_dimension_container_image_self_build: "{{ matrix_architecture != 'amd64' }}" - -matrix_dimension_container_network: "{{ matrix_addons_container_network }}" - -# Dimension is connected both to `matrix_addons_homeserver_container_network` and `matrix_homeserver_container_network`, -# because `matrix_dimension_homeserver_clientServerUrl` and `matrix_dimension_homeserver_federationUrl` are potentially -# going to different places. -matrix_dimension_container_additional_networks: | - {{ - ( - ([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network]) - + - ([matrix_homeserver_container_network] if matrix_homeserver_container_network != matrix_dimension_container_network else []) - + - ([postgres_container_network] if (postgres_enabled and matrix_dimension_database_hostname == postgres_connection_hostname and postgres_container_network != matrix_dimension_container_network) else []) - + - ([matrix_playbook_reverse_proxyable_services_additional_network] if matrix_playbook_reverse_proxyable_services_additional_network else []) - ) | unique - }} - -matrix_dimension_container_http_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ '8184') if matrix_playbook_service_host_bind_interface_prefix else '' }}" - -matrix_dimension_container_labels_traefik_enabled: "{{ matrix_playbook_traefik_labels_enabled }}" -matrix_dimension_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}" -matrix_dimension_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}" -matrix_dimension_container_labels_traefik_tls_certResolver: "{{ traefik_certResolver_primary }}" - -matrix_dimension_homeserver_clientServerUrl: "{{ matrix_addons_homeserver_client_api_url }}" -matrix_dimension_homeserver_federationUrl: "{{ matrix_homeserver_container_federation_url }}" -matrix_dimension_homeserver_mediaUrl: "{{ ('https' if matrix_playbook_ssl_enabled else 'http') }}://{{ matrix_server_fqn_matrix }}" - -# Dimension depends both on `matrix_addons_homeserver_systemd_services_list` and on the homeserver service, -# because `matrix_dimension_homeserver_clientServerUrl` and `matrix_dimension_homeserver_federationUrl` are potentially -# going to different places. -matrix_dimension_systemd_required_services_list_auto: | - {{ - ( - matrix_addons_homeserver_systemd_services_list - + - ['matrix-' + matrix_homeserver_implementation + '.service'] - + - ([postgres_identifier ~ '.service'] if (postgres_enabled and matrix_dimension_database_hostname == postgres_connection_hostname) else []) - ) | unique - }} - -# Postgres is the default, except if not using internal Postgres server -matrix_dimension_database_engine: "{{ 'postgres' if postgres_enabled else 'sqlite' }}" -matrix_dimension_database_hostname: "{{ postgres_connection_hostname if postgres_enabled else '' }}" -matrix_dimension_database_password: "{{ (matrix_homeserver_generic_secret_key + ':dimension.db') | hash('sha512') | to_uuid }}" - -###################################################################### -# -# /matrix-dimension -# -###################################################################### - ###################################################################### # # etherpad @@ -3269,7 +3198,7 @@ etherpad_scheme: "{{ 'https' if matrix_playbook_ssl_enabled else 'http' }}" etherpad_base_path: "{{ matrix_base_data_path }}/etherpad" -etherpad_framing_enabled: "{{ matrix_dimension_enabled or jitsi_enabled }}" +etherpad_framing_enabled: "{{ jitsi_enabled }}" etherpad_hostname: "{{ matrix_server_fqn_etherpad }}" @@ -3877,12 +3806,6 @@ postgres_managed_databases_auto: | 'password': matrix_steam_bridge_database_password, }] if (matrix_steam_bridge_enabled and matrix_steam_bridge_database_engine == 'postgres' and matrix_steam_bridge_database_hostname == postgres_connection_hostname) else []) + - ([{ - 'name': matrix_dimension_database_name, - 'username': matrix_dimension_database_username, - 'password': matrix_dimension_database_password, - }] if (matrix_dimension_enabled and matrix_dimension_database_engine == 'postgres' and matrix_dimension_database_hostname == postgres_connection_hostname) else []) - + ([{ 'name': etherpad_database_name, 'username': etherpad_database_postgres_username, @@ -4089,11 +4012,11 @@ matrix_client_element_container_labels_traefik_compression_middleware_name: "{{ matrix_client_element_default_hs_url: "{{ matrix_homeserver_url }}" matrix_client_element_default_is_url: "{{ matrix_identity_server_url }}" -# Use Dimension if enabled, otherwise fall back to Scalar -matrix_client_element_integrations_ui_url: "{{ matrix_dimension_integrations_ui_url if matrix_dimension_enabled else 'https://scalar.vector.im/' }}" -matrix_client_element_integrations_rest_url: "{{ matrix_dimension_integrations_rest_url if matrix_dimension_enabled else 'https://scalar.vector.im/api' }}" -matrix_client_element_integrations_widgets_urls: "{{ matrix_dimension_integrations_widgets_urls if matrix_dimension_enabled else ['https://scalar.vector.im/api'] }}" -matrix_client_element_integrations_jitsi_widget_url: "{{ matrix_dimension_integrations_jitsi_widget_url if matrix_dimension_enabled else 'https://scalar.vector.im/api/widgets/jitsi.html' }}" +# Use Scalar by default +matrix_client_element_integrations_ui_url: "https://scalar.vector.im/" +matrix_client_element_integrations_rest_url: "https://scalar.vector.im/api" +matrix_client_element_integrations_widgets_urls: "{{ ['https://scalar.vector.im/api'] }}" +matrix_client_element_integrations_jitsi_widget_url: "https://scalar.vector.im/api/widgets/jitsi.html" matrix_client_element_self_check_validate_certificates: "{{ matrix_playbook_ssl_enabled }}" @@ -4246,11 +4169,11 @@ matrix_client_schildichat_container_labels_traefik_tls_certResolver: "{{ traefik matrix_client_schildichat_default_hs_url: "{{ matrix_homeserver_url }}" matrix_client_schildichat_default_is_url: "{{ matrix_identity_server_url }}" -# Use Dimension if enabled, otherwise fall back to Scalar -matrix_client_schildichat_integrations_ui_url: "{{ matrix_dimension_integrations_ui_url if matrix_dimension_enabled else 'https://scalar.vector.im/' }}" -matrix_client_schildichat_integrations_rest_url: "{{ matrix_dimension_integrations_rest_url if matrix_dimension_enabled else 'https://scalar.vector.im/api' }}" -matrix_client_schildichat_integrations_widgets_urls: "{{ matrix_dimension_integrations_widgets_urls if matrix_dimension_enabled else ['https://scalar.vector.im/api'] }}" -matrix_client_schildichat_integrations_jitsi_widget_url: "{{ matrix_dimension_integrations_jitsi_widget_url if matrix_dimension_enabled else 'https://scalar.vector.im/api/widgets/jitsi.html' }}" +# Use Scalar by default +matrix_client_schildichat_integrations_ui_url: "https://scalar.vector.im/" +matrix_client_schildichat_integrations_rest_url: "https://scalar.vector.im/api" +matrix_client_schildichat_integrations_widgets_urls: "{{ ['https://scalar.vector.im/api'] }}" +matrix_client_schildichat_integrations_jitsi_widget_url: "https://scalar.vector.im/api/widgets/jitsi.html" matrix_client_schildichat_self_check_validate_certificates: "{{ matrix_playbook_ssl_enabled }}" @@ -4394,7 +4317,7 @@ matrix_synapse_tls_federation_listener_enabled: false matrix_synapse_tls_certificate_path: ~ matrix_synapse_tls_private_key_path: ~ -matrix_synapse_federation_port_openid_resource_required: "{{ not matrix_synapse_federation_enabled and (matrix_dimension_enabled or matrix_user_verification_service_enabled or matrix_livekit_jwt_service_enabled) }}" +matrix_synapse_federation_port_openid_resource_required: "{{ not matrix_synapse_federation_enabled and (matrix_user_verification_service_enabled or matrix_livekit_jwt_service_enabled) }}" matrix_synapse_metrics_enabled: "{{ prometheus_enabled or matrix_metrics_exposure_enabled }}" diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml index 7e6b0c3a9..49b3c89f3 100644 --- a/roles/custom/matrix-base/defaults/main.yml +++ b/roles/custom/matrix-base/defaults/main.yml @@ -121,9 +121,6 @@ matrix_server_fqn_fluffychat: "fluffychat.{{ matrix_domain }}" # This is where you access the Buscarron bot from (if enabled via matrix_bot_buscarron_enabled; disabled by default). matrix_server_fqn_buscarron: "buscarron.{{ matrix_domain }}" -# This is where you access the Dimension. -matrix_server_fqn_dimension: "dimension.{{ matrix_domain }}" - # This is where you access the Etherpad (if enabled via etherpad_enabled; disabled by default). matrix_server_fqn_etherpad: "etherpad.{{ matrix_domain }}" diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index 7a142fa3c..0aeecb1e9 100644 --- a/roles/custom/matrix-synapse/defaults/main.yml +++ b/roles/custom/matrix-synapse/defaults/main.yml @@ -561,7 +561,7 @@ matrix_synapse_http_listener_resource_names: ["client"] # Resources served on Synapse's federation port. # When disabling federation, we may wish to serve the `openid` resource here, -# so that services like Dimension can work. +# so that services like Matrix User Verification Service can work. matrix_synapse_federation_listener_resource_names: "{{ ['federation'] if matrix_synapse_federation_enabled else (['openid'] if matrix_synapse_federation_port_openid_resource_required else []) }}" # Enable this to allow Synapse to report utilization statistics about your server to matrix.org diff --git a/setup.yml b/setup.yml index a507505c8..7df31563b 100644 --- a/setup.yml +++ b/setup.yml @@ -115,7 +115,6 @@ - galaxy/jitsi - custom/matrix-user-verification-service - custom/matrix-ldap-registration-proxy - - custom/matrix-dimension - galaxy/etherpad - custom/matrix-sygnal - galaxy/ntfy