Просмотр исходного кода

Upgrade Traefik (v3.3.2-0 -> v3.3.2-1) and remove `traefik_config_certificatesResolvers_acme_email` references

Ref:

- https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4014
- 21b36ce336

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4014
pull/4021/head
Slavi Pantaleev 1 год назад
Родитель
Сommit
0515787de2
6 измененных файлов: 1 добавлений и 19 удалений
  1. +0
    -2
      CHANGELOG.md
  2. +0
    -2
      docs/configuring-playbook-own-webserver.md
  3. +0
    -3
      docs/howto-srv-server-delegation.md
  4. +0
    -10
      examples/vars.yml
  5. +1
    -1
      requirements.yml
  6. +0
    -1
      roles/custom/matrix-base/defaults/main.yml

+ 0
- 2
CHANGELOG.md Просмотреть файл

@@ -1246,8 +1246,6 @@ Unless we have some regression, **existing `matrix-nginx-proxy` users should be

```yaml
matrix_playbook_reverse_proxy_type: playbook-managed-traefik

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.


+ 0
- 2
docs/configuring-playbook-own-webserver.md Просмотреть файл

@@ -18,8 +18,6 @@ To have the playbook install and use Traefik, add the following configuration to

```yaml
matrix_playbook_reverse_proxy_type: playbook-managed-traefik

traefik_config_certificatesResolvers_acme_email: YOUR_EMAIL_ADDRESS
```

Traefik will manage SSL certificates for all services seamlessly.


+ 0
- 3
docs/howto-srv-server-delegation.md Просмотреть файл

@@ -64,7 +64,6 @@ traefik_configuration_extension_yaml: |
acme:
# To use a staging endpoint for testing purposes, uncomment the line below.
# caServer: https://acme-staging-v02.api.letsencrypt.org/directory
email: {{ traefik_config_certificatesResolvers_acme_email | to_json }}
dnsChallenge:
provider: cloudflare
resolvers:
@@ -124,7 +123,6 @@ matrix_coturn_container_additional_volumes: |
```yaml
# Choosing the reverse proxy implementation
matrix_playbook_reverse_proxy_type: playbook-managed-traefik
traefik_config_certificatesResolvers_acme_email: redacted@example.com

# To serve the federation from any domain, as long as the path matches
matrix_synapse_container_labels_public_federation_api_traefik_rule: PathPrefix(`/_matrix/federation`)
@@ -141,7 +139,6 @@ traefik_configuration_extension_yaml: |
acme:
# To use a staging endpoint for testing purposes, uncomment the line below.
# caServer: https://acme-staging-v02.api.letsencrypt.org/directory
email: {{ traefik_config_certificatesResolvers_acme_email | to_json }}
dnsChallenge:
provider: cloudflare
resolvers:


+ 0
- 10
examples/vars.yml Просмотреть файл

@@ -28,16 +28,6 @@ matrix_homeserver_generic_secret_key: ''
# For alternatives, see `docs/configuring-playbook-own-webserver.md`.
matrix_playbook_reverse_proxy_type: playbook-managed-traefik

# This is something which is provided to Let's Encrypt when retrieving SSL certificates for domains.
#
# In case SSL renewal fails at some point, you'll also get an email notification there.
#
# If you decide to use another method for managing SSL certificates (different than the default Let's Encrypt),
# you won't be required to define this variable (see `docs/configuring-playbook-ssl-certificates.md`).
#
# Example value: someone@example.com
traefik_config_certificatesResolvers_acme_email: ''

# A Postgres password to use for the superuser Postgres user (called `matrix` by default).
#
# The playbook creates additional Postgres users and databases (one for each enabled service)


+ 1
- 1
requirements.yml Просмотреть файл

@@ -64,7 +64,7 @@
version: v1.0.0-0
name: timesync
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-traefik.git
version: v3.3.2-0
version: v3.3.2-1
name: traefik
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-traefik-certs-dumper.git
version: v2.8.3-5


+ 0
- 1
roles/custom/matrix-base/defaults/main.yml Просмотреть файл

@@ -217,7 +217,6 @@ matrix_metrics_exposure_http_basic_auth_users: ''
# - `playbook-managed-traefik`
# - the playbook will run a managed Traefik instance (matrix-traefik)
# - Traefik will do SSL termination, unless you disable it (e.g. `traefik_config_entrypoint_web_secure_enabled: false`)
# - if SSL termination is enabled (as it is by default), you need to populate: `traefik_config_certificatesResolvers_acme_email`
#
# - `other-traefik-container`
# - this playbook will not install Traefik


Загрузка…
Отмена
Сохранить