From 0da308e24d9e3ad5d6b368e367d72190992d1d39 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 19 Feb 2023 10:19:54 +0200 Subject: [PATCH] Upgrade com.devture.ansible.role.traefik --- CHANGELOG.md | 2 +- docs/configuring-playbook-own-webserver.md | 2 +- requirements.yml | 2 +- roles/custom/matrix-base/defaults/main.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25d351387..5dd5e9f62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -118,7 +118,7 @@ Unless we have some regression, **existing `matrix-nginx-proxy` users should be ```yaml matrix_playbook_reverse_proxy_type: playbook-managed-traefik -devture_traefik_ssl_email_address: YOUR_EMAIL_ADDRESS +devture_traefik_config_certificatesResolvers_acme_email: YOUR_EMAIL_ADDRESS ``` You may still need to keep certain old `matrix_nginx_proxy_*` variables (like `matrix_nginx_proxy_base_domain_serving_enabled`), even when using Traefik. For now, we recommend keeping all `matrix_nginx_proxy_*` variables just in case. In the future, reliance on `matrix-nginx-proxy` will be removed. diff --git a/docs/configuring-playbook-own-webserver.md b/docs/configuring-playbook-own-webserver.md index d1975dae6..6377b8b1f 100644 --- a/docs/configuring-playbook-own-webserver.md +++ b/docs/configuring-playbook-own-webserver.md @@ -20,7 +20,7 @@ To switch to Traefik now, use configuration like this: ```yaml matrix_playbook_reverse_proxy_type: playbook-managed-traefik -devture_traefik_ssl_email_address: YOUR_EMAIL_ADDRESS +devture_traefik_config_certificatesResolvers_acme_email: YOUR_EMAIL_ADDRESS ``` This will install Traefik in the place of `matrix-nginx-proxy`. Traefik will manage SSL certificates for all services seamlessly. diff --git a/requirements.yml b/requirements.yml index 66089d478..ed0faa52e 100644 --- a/requirements.yml +++ b/requirements.yml @@ -49,7 +49,7 @@ version: v7.0.7-0 - src: git+https://github.com/devture/com.devture.ansible.role.traefik.git - version: fb09fd26f877372417d5586f1e79e83f983f0bd6 + version: da90b6cdbbb9374ca72c1b530867add2fd8f024e - src: git+https://github.com/devture/com.devture.ansible.role.traefik_certs_dumper.git version: e7563caa814e634d2f8deec4a41e970caa1c0ae4 diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml index e72142c37..da5459f80 100644 --- a/roles/custom/matrix-base/defaults/main.yml +++ b/roles/custom/matrix-base/defaults/main.yml @@ -283,7 +283,7 @@ matrix_homeserver_app_service_config_files_auto: [] # - `playbook-managed-traefik` # - the playbook will install devture-traefik # - Traefik will do SSL termination, unless you disable it (e.g. `devture_traefik_config_entrypoint_web_secure_enabled: false`) -# - if SSL termination is enabled (as it is by default), you need to populate: `devture_traefik_ssl_email_address` +# - if SSL termination is enabled (as it is by default), you need to populate: `devture_traefik_config_certificatesResolvers_acme_email` # - it will also install matrix-nginx-proxy in local-only mode, while we migrate the rest of the services to a Traefik-native mode of working # # - `playbook-managed-nginx`