[pull] develop from baserow:develop

.env.example

@@ -32,6 +32,8 @@ DATABASE_NAME=baserow
 # REDIS_PROTOCOL=
 # REDIS_URL=
 # REDIS_USER=
+# REDIS_SSL_CERT_REQS=
+# REDIS_SSL_CA_CERTS=
 
 # Uncomment and set these to enable Baserow to send emails.
 # EMAIL_SMTP=

backend/src/baserow/config/settings/base.py

@@ -158,9 +158,20 @@
 REDIS_USERNAME = os.getenv("REDIS_USER", "")
 REDIS_PASSWORD = os.getenv("REDIS_PASSWORD", "")
 REDIS_PROTOCOL = os.getenv("REDIS_PROTOCOL", "redis")
+REDIS_SSL_CERT_REQS = os.getenv("REDIS_SSL_CERT_REQS", "required")
+REDIS_SSL_CA_CERTS = os.getenv("REDIS_SSL_CA_CERTS", "")
+
+redis_auth = f"{REDIS_USERNAME}:{REDIS_PASSWORD}@" if REDIS_PASSWORD else ""
+redis_url_suffix = (
+    (f"?ssl_cert_reqs={REDIS_SSL_CERT_REQS}" if REDIS_PROTOCOL == "rediss" else "")
+    + f"&ssl_ca_certs={REDIS_SSL_CA_CERTS}"
+    if REDIS_SSL_CA_CERTS
+    else ""
+)
+
 REDIS_URL = os.getenv(
     "REDIS_URL",
-    f"{REDIS_PROTOCOL}://{REDIS_USERNAME}:{REDIS_PASSWORD}@{REDIS_HOST}:{REDIS_PORT}/0",
+    f"{REDIS_PROTOCOL}://{redis_auth}{REDIS_HOST}:{REDIS_PORT}/0{redis_url_suffix}",
 )
 
 BASEROW_GROUP_STORAGE_USAGE_QUEUE = os.getenv(

deploy/all-in-one/README.md

@@ -283,6 +283,8 @@ docker run \
   -e REDIS_PASSWORD=TODO \
   -e REDIS_PORT=TODO \
   -e REDIS_PROTOCOL=TODO \
+  -e REDIS_SSL_CERT_REQS=TODO \
+  -e REDIS_SSL_CA_CERTS=TODO \
   -v baserow_data:/baserow/data \
   -p 80:80 \
   -p 443:443 \

docker-compose.dev.yml

@@ -187,6 +187,8 @@ services:
       REDIS_PORT:
       REDIS_PROTOCOL:
       REDIS_URL:
+      REDIS_SSL_CERT_REQS:
+      REDIS_SSL_CA_CERTS:
       REDIS_USER:
       REDIS_PASSWORD: ${REDIS_PASSWORD:?}
     volumes:

docker-compose.no-caddy.yml

@@ -52,6 +52,8 @@ x-backend-variables:
   REDIS_PROTOCOL:
   REDIS_URL:
   REDIS_USER:
+  REDIS_SSL_CERT_REQS:
+  REDIS_SSL_CA_CERTS:
 
   # Set these to enable Baserow to send emails.
   EMAIL_SMTP:

docker-compose.yml

@@ -64,6 +64,8 @@ x-backend-variables:
   REDIS_PROTOCOL:
   REDIS_URL:
   REDIS_USER:
+  REDIS_SSL_CERT_REQS:
+  REDIS_SSL_CA_CERTS:
 
   # Set these to enable Baserow to send emails.
   EMAIL_SMTP:
@@ -384,7 +386,7 @@ services:
       test:
         [
           "CMD-SHELL",
-          "/baserow/backend/docker/docker-entrypoint.sh celery-beat-healthcheck"
+          "/baserow/backend/docker/docker-entrypoint.sh celery-beat-healthcheck",
         ]
       interval: 30s
       timeout: 10s

docs/installation/install-with-docker.md

@@ -260,6 +260,8 @@ docker run \
   -e REDIS_PASSWORD=TODO \
   -e REDIS_PORT=TODO \
   -e REDIS_PROTOCOL=TODO \
+  -e REDIS_SSL_CERT_REQS=TODO \
+  -e REDIS_SSL_CA_CERTS=TODO \
   -v baserow_data:/baserow/data \
   -p 80:80 \
   -p 443:443 \

docs/installation/install-with-k8s.md

@@ -44,6 +44,8 @@ stringData:
   REDIS_USER: "TODO"
   REDIS_PASSWORD: "TODO"
   REDIS_PROTOCOL: "TODO rediss or redis"
+  REDIS_SSL_CERT_REQS: "TODO required or optional or none" \
+  REDIS_SSL_CA_CERTS: "TODO"
   BASEROW_AMOUNT_OF_GUNICORN_WORKERS: "5"
   # S3 Compatible storage is recommended with K8S to get the exports and file storage working
   # See the docs for more info https://baserow.io/docs/installation%2Fconfiguration#user-file-upload-configuration

docs/technical/introduction.md

@@ -121,6 +121,9 @@ are accepted.
 * `REDIS_PASSWORD` (default ``):  The password of the Redis server.
 * `REDIS_PROTOCOL` (default `redis`): The redis protocol. Can either be `redis` or
   `rediss`.
+* `REDIS_SSL_CERT_REQS` (default `required`): whether the SSL certificate is required.
+  Can either be `required`, `optional` or `none`.
+* `REDIS_SSL_CA_CERTS` (default ``): The path to the CA file.
 * `EMAIL_SMTP` (default ``): Providing anything other than an empty string will enable
   SMTP email.
 * `EMAIL_SMTP_HOST` (default `localhost`): The hostname of the SMTP server.

web-frontend/yarn.lock

@@ -7227,9 +7227,9 @@ image-meta@^0.2.2:
   integrity sha512-3MOLanc3sb3LNGWQl1RlQlNWURE5g32aUphrDyFeCsxBTk08iE3VNe4CwsUZ0Qs1X+EfX0+r29Sxdpza4B+yRA==
 
 immutable@^4.0.0:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381"
-  integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==
+  version "4.3.8"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.8.tgz#02d183c7727fb2bb1d5d0380da0d779dce9296a7"
+  integrity sha512-d/Ld9aLbKpNwyl0KiM2CT1WYvkitQ1TSvmRtkcV8FKStiDoA7Slzgjmb/1G2yhKM1p0XeNOieaTbFZmU1d3Xuw==
 
 import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.1"