Merge remote-tracking branch 'origin/master' into nightly

CHANGELOG.md

@@ -4,6 +4,10 @@ Note: Breaking changes between versions are indicated by "💥".
 
 ## Unreleased
 
+## v13.1.2 (2022-01-30)
+
+- [Bugfix] Fix auto-renewal of certificates revoked by Let's Encrypt (see [discussion](https://community.letsencrypt.org/t/questions-about-renewing-before-tls-alpn-01-revocations/170449/21)).
+
 ## v13.1.1 (2022-01-25)
 
 - [Bugfix] Fix authentication in development due to missing SameSite policy on session ID cookie.

tutor/__about__.py

@@ -2,7 +2,7 @@ import os
 
 # Increment this version number to trigger a new release. See
 # docs/tutor.html#versioning for information on the versioning scheme.
-__version__ = "13.1.1"
+__version__ = "13.1.2"
 
 # The version suffix will be appended to the actual version, separated by a
 # dash. Use this suffix to differentiate between the actual released version and

tutor/templates/config/defaults.yml

@@ -11,7 +11,7 @@ DEV_PROJECT_NAME: "{{ TUTOR_APP }}_dev"
 DOCKER_REGISTRY: "docker.io/"
 DOCKER_IMAGE_OPENEDX: "{{ DOCKER_REGISTRY }}overhangio/openedx:{{ TUTOR_VERSION }}"
 DOCKER_IMAGE_OPENEDX_DEV: "openedx-dev"
-DOCKER_IMAGE_CADDY: "docker.io/caddy:2.3.0"
+DOCKER_IMAGE_CADDY: "docker.io/caddy:2.4.6"
 DOCKER_IMAGE_ELASTICSEARCH: "docker.io/elasticsearch:7.10.1"
 DOCKER_IMAGE_MONGODB: "docker.io/mongo:4.2.17"
 DOCKER_IMAGE_MYSQL: "docker.io/mysql:5.7.35"