Merge #2281 #2285 #2286 #2287

2281: Update alpine-linux to 3.14.4 - OpenSSL security FIX r=mergify[bot] a=willofr

## What type of PR?
Security fix

## What does this PR do?
Update Dockerfiles to use alpine-linux 3.14.4 which contains a security fix for openssl
https://alpinelinux.org/posts/Alpine-3.12.10-3.13.8-3.14.4-released.html

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


2285: Update names of language json files r=mergify[bot] a=ghostwheel42

## What type of PR?

bug-fix

## What does this PR do?

language json files of datatables i18n have been renamed
this updates the mappings to the current names


2286: Fix typo in Traefik reverse proxy docs r=mergify[bot] a=ghostwheel42

Slight typo in the Traefik reverse proxy docs. Found through running into the issue on my own instance.

## What type of PR?

documentation

## What does this PR do?

Adds  #2282 to master


2287: Fix typo in docs: cert not certs r=mergify[bot] a=ghostwheel42

## What type of PR?

documentation

## What does this PR do?

just a typo

Co-authored-by: Will <will@packer-output-c8fcfb40-3d93-4475-8f87-e14a9dd683b6>
Co-authored-by: willofr <willofr@users.noreply.github.com>
Co-authored-by: Alexander Graf <ghostwheel42@users.noreply.github.com>
Co-authored-by: DAHPr0gram3r <cbillwork02@gmail.com>

core/admin/Dockerfile

@@ -1,5 +1,5 @@
 # First stage to build assets
-ARG DISTRO=alpine:3.14.3
+ARG DISTRO=alpine:3.14.4
 ARG ARCH=""
 
 FROM ${ARCH}node:16 as assets
@@ -13,7 +13,7 @@ COPY webpack.config.js ./
 COPY assets ./assets
 RUN set -eu \
  && sed -i 's/#007bff/#55a5d9/' node_modules/admin-lte/build/scss/_bootstrap-variables.scss \
- && for l in ca da de:de_de en:en-gb es:es_es eu fr:fr_fr he hu is it:it_it ja nb_NO:no_nb nl:nl_nl pl pt:pt_pt ru sv:sv_se zh; do \
+ && for l in ca da de:de-DE en:en-GB es:es-ES eu fr:fr-FR he hu is it:it-IT ja nb_NO:no-NB nl:nl-NL pl pt:pt-PT ru sv:sv-SE zh; do \
       cp node_modules/datatables.net-plugins/i18n/${l#*:}.json assets/${l%:*}.json; \
     done \
  && node_modules/.bin/webpack-cli --color
@@ -59,4 +59,4 @@ ENV FLASK_APP mailu
 CMD /start.py
 
 HEALTHCHECK CMD curl -f -L http://localhost/sso/login?next=ui.index || exit 1
-RUN echo $VERSION >> /version
+RUN echo $VERSION >> /version

core/dovecot/Dockerfile

@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.3
+ARG DISTRO=alpine:3.14.4
 
 FROM $DISTRO
 ARG VERSION

core/nginx/Dockerfile

@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.3
+ARG DISTRO=alpine:3.14.4
 FROM $DISTRO
 ARG VERSION
 

core/none/Dockerfile

@@ -1,6 +1,6 @@
 # This is an idle image to dynamically replace any component if disabled.
 
-ARG DISTRO=alpine:3.14.3
+ARG DISTRO=alpine:3.14.4
 FROM $DISTRO
 
 CMD sleep 1000000d

core/postfix/Dockerfile

@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.3
+ARG DISTRO=alpine:3.14.4
 
 FROM $DISTRO
 ARG VERSION

docs/faq.rst

@@ -527,7 +527,7 @@ These issues are typically caused by four scenarios:
 #. Certificates expired;
 #. When ``TLS_FLAVOR=letsencrypt``, it might be that the *certbot* script is not capable of
    obtaining the certificates for your domain. See `letsencrypt issues`_
-#. When ``TLS_FLAVOR=certs``, certificates are supposed to be copied to ``/mailu/certs``.
+#. When ``TLS_FLAVOR=cert``, certificates are supposed to be copied to ``/mailu/certs``.
    Using an external ``letsencrypt`` program, it tends to happen people copy the whole
    ``letsencrypt/live`` directory containing symlinks. Symlinks do not resolve inside the
    container and therefore it breaks the TLS implementation.

docs/reverse.rst

@@ -189,7 +189,7 @@ Mailu must also be configured with the information what header is used by the re
 .. code-block:: docker
   
   #mailu.env file
-  REAL_IP_HEADER=X-Real-IP
+  REAL_IP_HEADER=X-Real-Ip
   REAL_IP_FROM=x.x.x.x,y.y.y.y.y
   #x.x.x.x,y.y.y.y.y is the static IP address your reverse proxy uses for connecting to Mailu. 
 

docs/rpi_build.rst

@@ -17,8 +17,8 @@ Adjustments
 ``build_arm.sh`` uses some variables passed as ``build-arg`` to docker-compose:
 
 - ``ALPINE_VER``: version of ALPINE to use
-- ``DISTRO``: is the main distro used. Dockerfiles are set on Alpine 3.10, and
+- ``DISTRO``: is the main distro used. Dockerfiles are set on Alpine 3.14, and
-  build script overrides for ``balenalib/rpi-alpine:3.10``
+  build script overrides for ``balenalib/rpi-alpine:3.14``
 - ``QEMU``: Used by webmails dockerfiles. It will add ``qemu-arm-static`` only
   if ``QEMU`` is set to ``arm``
 - ``ARCH``: Architecture to use for ``admin``, and ``webmails`` as their images

optional/clamav/Dockerfile

@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.3
+ARG DISTRO=alpine:3.14.4
 FROM $DISTRO
 ARG VERSION
 

optional/fetchmail/Dockerfile

@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.3
+ARG DISTRO=alpine:3.14.4
 FROM $DISTRO
 ARG VERSION
 

optional/radicale/Dockerfile

@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.3
+ARG DISTRO=alpine:3.14.4
 FROM $DISTRO
 ARG VERSION
 

optional/unbound/Dockerfile

@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.3
+ARG DISTRO=alpine:3.14.4
 FROM $DISTRO
 ARG VERSION
 

setup/Dockerfile

@@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.14.3
+ARG DISTRO=alpine:3.14.4
 FROM $DISTRO
 ARG VERSION
 ENV TZ Etc/UTC

towncrier/newsfragments/2281.bugfix

@@ -0,0 +1 @@
+Update to Alpine Linux 3.14.4 which contains a security fix for openssl.