diff --git a/jitsi_jvb.yml b/jitsi_jvb.yml index d57c15a97..49d0245e9 100644 --- a/jitsi_jvb.yml +++ b/jitsi_jvb.yml @@ -11,11 +11,11 @@ become: true roles: - - role: galaxy/com.devture.ansible.role.playbook_help - - role: galaxy/com.devture.ansible.role.systemd_docker_base + - role: playbook_help + - role: systemd_docker_base - when: matrix_playbook_docker_installation_enabled | bool - role: galaxy/geerlingguy.docker + role: docker vars: docker_install_compose: false tags: @@ -26,7 +26,7 @@ - install-all - when: devture_docker_sdk_for_python_installation_enabled | bool - role: galaxy/com.devture.ansible.role.docker_sdk_for_python + role: docker_sdk_for_python tags: - setup-docker - setup-all @@ -35,8 +35,8 @@ - install-all - custom/matrix-base - - galaxy/jitsi + - jitsi - custom/matrix-common-after - when: devture_systemd_service_manager_enabled | bool - role: galaxy/com.devture.ansible.role.systemd_service_manager + role: systemd_service_manager diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml b/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml index c81729c24..9712fcd55 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml @@ -181,7 +181,7 @@ matrix_appservice_kakaotalk_configuration: "{{ matrix_appservice_kakaotalk_confi # # The side-effect of this lookup is that Ansible would even parse the JSON for us, returning a dict. # This is unlike what it does when looking up YAML template files (no automatic parsing there). -matrix_appservice_kakaotalk_node_configuration_default: "{{ lookup('template', 'templates/node-config.json.j2', convert_data=False) | from_json }}" +matrix_appservice_kakaotalk_node_configuration_default: "{{ lookup('template', 'templates/node-config.json.j2') | from_json }}" # Your custom JSON configuration for appservice-kakaotalk-node should go to `matrix_appservice_kakaotalk_node_configuration_extension_json`. # This configuration extends the default starting configuration (`matrix_appservice_kakaotalk_node_configuration_default`). diff --git a/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml index 6b902851d..2a1923679 100644 --- a/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml @@ -150,7 +150,6 @@ matrix_mautrix_telegram_appservice_database_type: "{{ { 'sqlite': 'sqlite3-fk-wal', 'postgres': 'postgres', }[matrix_mautrix_telegram_database_engine] }}" - matrix_mautrix_telegram_appservice_database_uri: "{{ { 'sqlite': matrix_mautrix_telegram_sqlite_database_path_in_container, 'postgres': matrix_mautrix_telegram_database_connection_string, diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml index def78eac3..e042bc179 100644 --- a/roles/custom/matrix-client-element/defaults/main.yml +++ b/roles/custom/matrix-client-element/defaults/main.yml @@ -315,7 +315,7 @@ matrix_client_element_setting_defaults_custom_themes: [] # noqa var-naming # # The side-effect of this lookup is that Ansible would even parse the JSON for us, returning a dict. # This is unlike what it does when looking up YAML template files (no automatic parsing there). -matrix_client_element_configuration_default: "{{ lookup('template', 'templates/config.json.j2', convert_data=False) | from_json }}" +matrix_client_element_configuration_default: "{{ lookup('template', 'templates/config.json.j2') | from_json }}" # Your custom JSON configuration for Element Web should go to `matrix_client_element_configuration_extension_json`. # This configuration extends the default starting configuration (`matrix_client_element_configuration_default`). @@ -353,7 +353,7 @@ matrix_client_element_location_sharing_enabled: false # # The side-effect of this lookup is that Ansible would even parse the JSON for us, returning a dict. # This is unlike what it does when looking up YAML template files (no automatic parsing there). -matrix_client_element_location_sharing_map_style_default: "{{ lookup('template', 'templates/map_style.json.j2', convert_data=False) | from_json }}" +matrix_client_element_location_sharing_map_style_default: "{{ lookup('template', 'templates/map_style.json.j2') | from_json }}" # Your custom JSON configuration for Element location sharing map style should go to `matrix_client_element_location_sharing_map_style_extension_json`. # This configuration extends the default starting configuration (`matrix_client_element_location_sharing_map_style_default`). diff --git a/roles/custom/matrix-client-schildichat/defaults/main.yml b/roles/custom/matrix-client-schildichat/defaults/main.yml index ec160ff40..9a805ffde 100644 --- a/roles/custom/matrix-client-schildichat/defaults/main.yml +++ b/roles/custom/matrix-client-schildichat/defaults/main.yml @@ -225,7 +225,7 @@ matrix_client_schildichat_setting_defaults_custom_themes: [] # noqa var-naming # # The side-effect of this lookup is that Ansible would even parse the JSON for us, returning a dict. # This is unlike what it does when looking up YAML template files (no automatic parsing there). -matrix_client_schildichat_configuration_default: "{{ lookup('template', 'templates/config.json.j2', convert_data=False) | from_json }}" +matrix_client_schildichat_configuration_default: "{{ lookup('template', 'templates/config.json.j2') | from_json }}" # Your custom JSON configuration for SchildiChat Web should go to `matrix_client_schildichat_configuration_extension_json`. # This configuration extends the default starting configuration (`matrix_client_schildichat_configuration_default`). @@ -263,7 +263,7 @@ matrix_client_schildichat_location_sharing_enabled: false # # The side-effect of this lookup is that Ansible would even parse the JSON for us, returning a dict. # This is unlike what it does when looking up YAML template files (no automatic parsing there). -matrix_client_schildichat_location_sharing_map_style_default: "{{ lookup('template', 'templates/map_style.json.j2', convert_data=False) | from_json }}" +matrix_client_schildichat_location_sharing_map_style_default: "{{ lookup('template', 'templates/map_style.json.j2') | from_json }}" # Your custom JSON configuration for SchildiChat location sharing map style should go to `matrix_client_schildichat_location_sharing_map_style_extension_json`. # This configuration extends the default starting configuration (`matrix_client_schildichat_location_sharing_map_style_default`). diff --git a/roles/custom/matrix-corporal/defaults/main.yml b/roles/custom/matrix-corporal/defaults/main.yml index e33c02cbf..679c63a6b 100644 --- a/roles/custom/matrix-corporal/defaults/main.yml +++ b/roles/custom/matrix-corporal/defaults/main.yml @@ -151,7 +151,7 @@ matrix_corporal_debug: false # # The side-effect of this lookup is that Ansible would even parse the JSON for us, returning a dict. # This is unlike what it does when looking up YAML template files (no automatic parsing there). -matrix_corporal_configuration_default: "{{ lookup('template', 'templates/config.json.j2', convert_data=False) | from_json }}" +matrix_corporal_configuration_default: "{{ lookup('template', 'templates/config.json.j2') | from_json }}" # Your custom JSON configuration for Corporal should go to `matrix_corporal_configuration_extension_json`. # This configuration extends the default starting configuration (`matrix_corporal_configuration_default`). diff --git a/roles/custom/matrix-static-files/defaults/main.yml b/roles/custom/matrix-static-files/defaults/main.yml index dad62ba53..3535c3b32 100644 --- a/roles/custom/matrix-static-files/defaults/main.yml +++ b/roles/custom/matrix-static-files/defaults/main.yml @@ -216,7 +216,7 @@ matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_cust # # For a more advanced customization, you can extend the default (see `matrix_static_files_file_matrix_client_configuration_extension_json`) # or completely replace this variable with your own template. -matrix_static_files_file_matrix_client_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/client.j2', convert_data=False) | from_json }}" +matrix_static_files_file_matrix_client_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/client.j2') | from_json }}" # Your custom JSON configuration for /.well-known/matrix/client should go to `matrix_static_files_file_matrix_client_configuration_extension_json`. # This configuration extends the default starting configuration (`matrix_static_files_file_matrix_client_configuration_extension_json`). @@ -270,7 +270,7 @@ matrix_static_files_file_matrix_server_property_m_server: '' # # For a more advanced customization, you can extend the default (see `matrix_static_files_file_matrix_server_configuration_extension_json`) # or completely replace this variable with your own template. -matrix_static_files_file_matrix_server_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/server.j2', convert_data=False) | from_json }}" +matrix_static_files_file_matrix_server_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/server.j2') | from_json }}" # Your custom JSON configuration for /.well-known/matrix/server should go to `matrix_static_files_file_matrix_server_configuration_extension_json`. # This configuration extends the default starting configuration (`matrix_static_files_file_matrix_server_configuration_extension_json`). @@ -326,7 +326,7 @@ matrix_static_files_file_matrix_support_property_m_support_page: "" # # For a more advanced customization, you can extend the default (see `matrix_static_files_file_matrix_support_configuration_extension_json`) # or completely replace this variable with your own template. -matrix_static_files_file_matrix_support_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/support.j2', convert_data=False) | from_json }}" +matrix_static_files_file_matrix_support_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/support.j2') | from_json }}" # Your custom JSON configuration for /.well-known/matrix/support should go to `matrix_static_files_file_matrix_support_configuration_extension_json`. # This configuration extends the default starting configuration (`matrix_static_files_file_matrix_support_configuration_extension_json`). diff --git a/setup.yml b/setup.yml index fa136203a..1527d447c 100644 --- a/setup.yml +++ b/setup.yml @@ -5,17 +5,17 @@ roles: # Most of the roles below are not distributed with the playbook, but downloaded separately using `ansible-galaxy` via the `just roles` command (see `justfile`). - - role: galaxy/playbook_help + - role: playbook_help tags: - setup-all - install-all - - role: galaxy/systemd_docker_base + - role: systemd_docker_base - role: custom/matrix_playbook_migration - when: matrix_playbook_docker_installation_enabled | bool - role: galaxy/docker + role: docker vars: docker_install_compose: false docker_install_compose_plugin: false @@ -26,7 +26,7 @@ - install-all - when: devture_docker_sdk_for_python_installation_enabled | bool - role: galaxy/docker_sdk_for_python + role: docker_sdk_for_python tags: - setup-docker - setup-all @@ -34,7 +34,7 @@ - install-all - when: devture_timesync_installation_enabled | bool - role: galaxy/timesync + role: timesync tags: - setup-timesync - setup-all @@ -42,12 +42,12 @@ - install-all - custom/matrix-base - - galaxy/ddclient - - galaxy/exim_relay + - ddclient + - exim_relay - - role: galaxy/postgres + - role: postgres - - galaxy/valkey + - valkey - role: custom/matrix-authentication-service - custom/matrix-corporal @@ -99,58 +99,58 @@ - custom/matrix-tuwunel - custom/matrix-ketesa - custom/matrix-synapse-usage-exporter - - galaxy/prometheus_nginxlog_exporter - - galaxy/prometheus_node_exporter - - galaxy/prometheus_postgres_exporter - - galaxy/prometheus - - galaxy/grafana + - prometheus_nginxlog_exporter + - prometheus_node_exporter + - prometheus_postgres_exporter + - prometheus + - grafana - custom/matrix-prometheus-services-connect - custom/matrix-client-element - custom/matrix-client-commet - - galaxy/hydrogen - - galaxy/cinny - - galaxy/sable + - hydrogen + - cinny + - sable - custom/matrix-client-schildichat - custom/matrix-client-fluffychat - - galaxy/jitsi + - jitsi - custom/matrix-user-verification-service - - galaxy/etherpad + - etherpad - custom/matrix-sygnal - - galaxy/ntfy + - ntfy - custom/matrix-static-files - - galaxy/coturn + - coturn - custom/matrix-media-repo - custom/matrix-pantalaimon - custom/matrix-element-admin - custom/matrix-element-call - - galaxy/livekit_server + - livekit_server - custom/matrix-livekit-jwt-service - - role: galaxy/postgres_backup + - role: postgres_backup - - role: galaxy/backup_borg + - role: backup_borg - custom/matrix-user-creator - custom/matrix-common-after - - role: galaxy/container_socket_proxy + - role: container_socket_proxy - - role: galaxy/traefik + - role: traefik - - role: galaxy/traefik_certs_dumper + - role: traefik_certs_dumper - - role: galaxy/auxiliary + - role: auxiliary - when: devture_systemd_service_manager_enabled | bool - role: galaxy/systemd_service_manager + role: systemd_service_manager # This is pretty much last, because we want it to better serve as a "last known good configuration". # See: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2217#issuecomment-1301487601 - when: devture_playbook_state_preserver_enabled | bool - role: galaxy/playbook_state_preserver + role: playbook_state_preserver tags: - setup-all - install-all - - role: galaxy/playbook_runtime_messages + - role: playbook_runtime_messages