diff --git a/config/welcome/apache2/remoteip.conf b/config/welcome/apache2/remoteip.conf new file mode 100644 index 0000000000000000000000000000000000000000..607b5d891a1a57f68c372967ce07e0eb0a03901a --- /dev/null +++ b/config/welcome/apache2/remoteip.conf @@ -0,0 +1,2 @@ +RemoteIPHeader X-Forwarded-For +RemoteIPTrustedProxy nginx diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml index 7a03729f2a07f53cc59f830a42212fb6c04e0c39..0f2d0e25792ab9416772e0e3cf70f35c50d376a6 100644 --- a/templates/docker-compose/docker-compose.yml +++ b/templates/docker-compose/docker-compose.yml @@ -92,7 +92,7 @@ services: - /mnt/repo-base/volumes/redis/tmp:/tmp/redis welcome: - image: registry.gitlab.e.foundation/e/infra/docker-welcome:2.1.2 + image: registry.gitlab.e.foundation/e/infra/docker-welcome:2.1.3 container_name: welcome environment: - DOMAINS=${VHOSTS_ACCOUNTS} @@ -118,8 +118,7 @@ services: - default volumes: - /mnt/repo-base/volumes/accounts:/var/accounts - depends_on: - - mariadb + - /mnt/repo-base/config/welcome/apache2/remoteip.conf:/etc/apache2/conf-available/remoteip.conf extra_hosts: - "${DOMAIN}:${NC_HOST_IP}" @@ -148,6 +147,7 @@ services: - /mnt/repo-base/volumes/redis/db:/tmp/redis depends_on: - mariadb + - redis automx: image: registry.gitlab.e.foundation/e/infra/docker-mailstack:automx-0.1.0