merge base

# Conflicts:
#	.docker/Dockerfile.kimai-base

.docker/000-default.conf

@@ -10,6 +10,19 @@
     PassEnv TRUSTED_PROXIES
     PassEnv TRUSTED_HOSTS
 
+    SetEnvIf X-Forwarded-Proto https HTTPS=on
+    RequestHeader set X-Forwarded-Proto "https"
+    RequestHeader set X-Forwarded-For "%{REMOTE_ADDR}s"
+    RemoteIPHeader X-Forwarded-For
+
+    # Define a macro to set the RemoteIPTrustedProxy directive
+    <Macro SetTrustedProxy PROXY>
+        RemoteIPTrustedProxy ${PROXY}
+    </Macro>
+
+    # Use the macro, passing the environment variable TRUSTED_PROXIES
+    Use SetTrustedProxy %{TRUSTED_PROXIES}e
+
     <Directory "/opt/kimai/public">
         Require all granted
         DirectoryIndex index.php

Dockerfile

@@ -168,6 +168,9 @@ RUN apt-get update && \
         libfreetype6 && \
     echo "Listen 8001" > /etc/apache2/ports.conf && \
     a2enmod rewrite && \
+    a2enmod headers && \
+    a2enmod remoteip && \
+    a2enmod macro && \
     touch /use_apache
 
 COPY .docker/000-default.conf /etc/apache2/sites-available/000-default.conf