From dee861b8615a418428dbf0a01b9524abbf8d5913 Mon Sep 17 00:00:00 2001
From: akhil <akhil.potukuchi@gmail.com>
Date: Wed, 27 Oct 2021 17:42:32 +0530
Subject: [PATCH 1/2] Fixed dependencies in compose file

---
 templates/docker-compose/docker-compose.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml
index 7a03729..feefe7c 100644
--- a/templates/docker-compose/docker-compose.yml
+++ b/templates/docker-compose/docker-compose.yml
@@ -118,8 +118,6 @@ services:
       - default
     volumes:
       - /mnt/repo-base/volumes/accounts:/var/accounts
-    depends_on:
-      - mariadb
     extra_hosts:
       - "${DOMAIN}:${NC_HOST_IP}"
 
@@ -148,6 +146,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
-- 
GitLab


From 94a35a991338a5553963df98b20e73aae3e18f07 Mon Sep 17 00:00:00 2001
From: akhil <akhil.potukuchi@gmail.com>
Date: Wed, 27 Oct 2021 17:49:36 +0530
Subject: [PATCH 2/2] Added welcome 2.1.3

---
 config/welcome/apache2/remoteip.conf        | 2 ++
 templates/docker-compose/docker-compose.yml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 config/welcome/apache2/remoteip.conf

diff --git a/config/welcome/apache2/remoteip.conf b/config/welcome/apache2/remoteip.conf
new file mode 100644
index 0000000..607b5d8
--- /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 feefe7c..0f2d0e2 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,6 +118,7 @@ services:
       - default
     volumes:
       - /mnt/repo-base/volumes/accounts:/var/accounts
+      - /mnt/repo-base/config/welcome/apache2/remoteip.conf:/etc/apache2/conf-available/remoteip.conf
     extra_hosts:
       - "${DOMAIN}:${NC_HOST_IP}"
 
-- 
GitLab