From ab1599181452d6a6efabbbe53188106780054d4b Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 4 Jan 2024 13:00:46 +0200 Subject: [PATCH] Fix some ansible-lint-reported errors --- roles/custom/matrix-bridge-hookshot/defaults/main.yml | 2 +- roles/custom/matrix-bridge-mautrix-facebook/defaults/main.yml | 2 +- .../matrix-bridge-mautrix-facebook/tasks/validate_config.yml | 1 - .../custom/matrix-bridge-mautrix-instagram/defaults/main.yml | 2 +- roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml | 2 +- roles/custom/matrix-static-files/defaults/main.yml | 4 ++-- roles/custom/matrix-static-files/tasks/validate_config.yml | 1 - .../matrix-synapse-reverse-proxy-companion/defaults/main.yml | 2 +- .../tasks/validate_config.yml | 1 - 9 files changed, 7 insertions(+), 10 deletions(-) diff --git a/roles/custom/matrix-bridge-hookshot/defaults/main.yml b/roles/custom/matrix-bridge-hookshot/defaults/main.yml index 20b0516f4..60b7c0ea2 100644 --- a/roles/custom/matrix-bridge-hookshot/defaults/main.yml +++ b/roles/custom/matrix-bridge-hookshot/defaults/main.yml @@ -237,7 +237,7 @@ matrix_hookshot_container_extra_arguments: [] matrix_hookshot_container_labels_traefik_enabled: true matrix_hookshot_container_labels_traefik_docker_network: "{{ matrix_hookshot_container_network }}" matrix_hookshot_container_labels_traefik_entrypoints: web-secure -matrix_hookshot_container_labels_traefik_tls_certResolver: default +matrix_hookshot_container_labels_traefik_tls_certResolver: default # noqa var-naming # Controls whether labels will be added that expose Hookshot's webhooks endpoint matrix_hookshot_container_labels_webhooks_enabled: true diff --git a/roles/custom/matrix-bridge-mautrix-facebook/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-facebook/defaults/main.yml index 19c5257e4..a9eb8e770 100644 --- a/roles/custom/matrix-bridge-mautrix-facebook/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-facebook/defaults/main.yml @@ -45,7 +45,7 @@ matrix_mautrix_facebook_container_additional_networks_custom: [] matrix_mautrix_facebook_container_labels_traefik_enabled: true matrix_mautrix_facebook_container_labels_traefik_docker_network: "{{ matrix_mautrix_facebook_container_network }}" matrix_mautrix_facebook_container_labels_traefik_entrypoints: web-secure -matrix_mautrix_facebook_container_labels_traefik_tls_certResolver: default +matrix_mautrix_facebook_container_labels_traefik_tls_certResolver: default # noqa var-naming # Controls whether labels will be added that expose mautrix-facebook's public endpoint matrix_mautrix_facebook_container_labels_public_endpoint_enabled: "{{ matrix_mautrix_facebook_appservice_public_enabled }}" diff --git a/roles/custom/matrix-bridge-mautrix-facebook/tasks/validate_config.yml b/roles/custom/matrix-bridge-mautrix-facebook/tasks/validate_config.yml index 707979972..879e8a0ca 100644 --- a/roles/custom/matrix-bridge-mautrix-facebook/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-mautrix-facebook/tasks/validate_config.yml @@ -37,4 +37,3 @@ "NOTE: Your mautrix-facebook bridge is still on SQLite and on the last version that supported it, before support was dropped. Support has been subsequently re-added in v0.3.2, so we advise you to upgrade (by removing your `matrix_mautrix_facebook_docker_image` definition from vars.yml)" ] }} - diff --git a/roles/custom/matrix-bridge-mautrix-instagram/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-instagram/defaults/main.yml index d8fcaab41..04ef1af90 100644 --- a/roles/custom/matrix-bridge-mautrix-instagram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-instagram/defaults/main.yml @@ -46,7 +46,7 @@ matrix_mautrix_instagram_container_additional_networks_custom: [] matrix_mautrix_instagram_container_labels_traefik_enabled: true matrix_mautrix_instagram_container_labels_traefik_docker_network: "{{ matrix_mautrix_instagram_container_network }}" matrix_mautrix_instagram_container_labels_traefik_entrypoints: web-secure -matrix_mautrix_instagram_container_labels_traefik_tls_certResolver: default +matrix_mautrix_instagram_container_labels_traefik_tls_certResolver: default # noqa var-naming # Controls whether labels will be added that expose mautrix-instagram's metrics matrix_mautrix_instagram_container_labels_metrics_enabled: "{{ matrix_mautrix_instagram_metrics_enabled and matrix_mautrix_instagram_metrics_proxying_enabled }}" diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml index 8283827bd..b9fc41b37 100644 --- a/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml @@ -40,7 +40,7 @@ matrix_mautrix_whatsapp_container_additional_networks_custom: [] matrix_mautrix_whatsapp_container_labels_traefik_enabled: true matrix_mautrix_whatsapp_container_labels_traefik_docker_network: "{{ matrix_mautrix_whatsapp_container_network }}" matrix_mautrix_whatsapp_container_labels_traefik_entrypoints: web-secure -matrix_mautrix_whatsapp_container_labels_traefik_tls_certResolver: default +matrix_mautrix_whatsapp_container_labels_traefik_tls_certResolver: default # noqa var-naming # Controls whether labels will be added that expose mautrix-whatsapp's metrics matrix_mautrix_whatsapp_container_labels_metrics_enabled: "{{ matrix_mautrix_whatsapp_metrics_enabled and matrix_mautrix_whatsapp_metrics_proxying_enabled }}" diff --git a/roles/custom/matrix-static-files/defaults/main.yml b/roles/custom/matrix-static-files/defaults/main.yml index 89fb02a33..3735bea03 100644 --- a/roles/custom/matrix-static-files/defaults/main.yml +++ b/roles/custom/matrix-static-files/defaults/main.yml @@ -46,7 +46,7 @@ matrix_static_files_container_http_host_bind_port: '' matrix_static_files_container_labels_traefik_enabled: true matrix_static_files_container_labels_traefik_docker_network: "{{ matrix_static_files_container_network }}" matrix_static_files_container_labels_traefik_entrypoints: web-secure -matrix_static_files_container_labels_traefik_tls_certResolver: default +matrix_static_files_container_labels_traefik_tls_certResolver: default # noqa var-naming # Controls whether labels will be added that expose the well-known public endpoint on the matrix domain. matrix_static_files_container_labels_well_known_matrix_endpoint_enabled: true @@ -61,7 +61,7 @@ matrix_static_files_container_labels_well_known_matrix_endpoint_traefik_tls_cert # The web-server only compresses known file types and our /.well-known/matrix/* files have no file extension. # As such, they are not being compressed there and we compress them at the Traefik level. matrix_static_files_container_labels_well_known_matrix_endpoint_middleware_compress_enabled: true -matrix_static_files_container_labels_well_known_matrix_endpoint_middleware_compress_minResponseBodyBytes: 100 # noqa var-naming +matrix_static_files_container_labels_well_known_matrix_endpoint_middleware_compress_minResponseBodyBytes: 100 # noqa var-naming # Controls whether labels will be added that serve the base domain. # diff --git a/roles/custom/matrix-static-files/tasks/validate_config.yml b/roles/custom/matrix-static-files/tasks/validate_config.yml index 21d91195e..6d4cc7978 100644 --- a/roles/custom/matrix-static-files/tasks/validate_config.yml +++ b/roles/custom/matrix-static-files/tasks/validate_config.yml @@ -11,4 +11,3 @@ - {'name': 'matrix_static_files_container_labels_base_domain_traefik_hostname', when: "{{ matrix_static_files_container_labels_base_domain_enabled }}"} - {'name': 'matrix_static_files_container_labels_base_domain_traefik_path_prefix', when: "{{ matrix_static_files_container_labels_base_domain_enabled }}"} - diff --git a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml index d60f7ce8d..7c80677dc 100644 --- a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml +++ b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml @@ -69,7 +69,7 @@ matrix_synapse_reverse_proxy_companion_container_federation_api_host_bind_port: matrix_synapse_reverse_proxy_companion_container_labels_traefik_enabled: true matrix_synapse_reverse_proxy_companion_container_labels_traefik_docker_network: "{{ matrix_synapse_reverse_proxy_companion_container_network }}" matrix_synapse_reverse_proxy_companion_container_labels_traefik_entrypoints: web-secure -matrix_synapse_reverse_proxy_companion_container_labels_traefik_tls_certResolver: default +matrix_synapse_reverse_proxy_companion_container_labels_traefik_tls_certResolver: default # noqa var-naming matrix_synapse_reverse_proxy_companion_container_labels_traefik_hostname: '' # Controls whether labels will be added for handling the root (/) path diff --git a/roles/custom/matrix-synapse-reverse-proxy-companion/tasks/validate_config.yml b/roles/custom/matrix-synapse-reverse-proxy-companion/tasks/validate_config.yml index 47854fc07..2612de86b 100644 --- a/roles/custom/matrix-synapse-reverse-proxy-companion/tasks/validate_config.yml +++ b/roles/custom/matrix-synapse-reverse-proxy-companion/tasks/validate_config.yml @@ -19,4 +19,3 @@ - {'name': 'matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_hostname', when: "{{ matrix_synapse_reverse_proxy_companion_container_labels_federation_api_enabled }}"} - {'name': 'matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_entrypoints', when: "{{ matrix_synapse_reverse_proxy_companion_container_labels_federation_api_enabled }}"} -