From 4af039070f89e799e95bfd457817088c465f5282 Mon Sep 17 00:00:00 2001
From: Raine <raine@ixvd.net>
Date: Fri, 20 Oct 2023 15:50:56 +0200
Subject: [PATCH] fix: remove old cfg from keymaker

---
 .../custom/nginx/conf.d/rainloop.conf         |  8 -----
 .../docker-compose.d/docker-compose.dms.yml   | 34 -------------------
 .../docker-compose.rainloop.yml               | 19 -----------
 .../custom/nginx/conf.d/default.conf          |  4 +++
 4 files changed, 4 insertions(+), 61 deletions(-)
 delete mode 100644 servers/keymaker/docker-compose.d/custom/nginx/conf.d/rainloop.conf
 delete mode 100644 servers/keymaker/docker-compose.d/docker-compose.dms.yml
 delete mode 100644 servers/keymaker/docker-compose.d/docker-compose.rainloop.yml

diff --git a/servers/keymaker/docker-compose.d/custom/nginx/conf.d/rainloop.conf b/servers/keymaker/docker-compose.d/custom/nginx/conf.d/rainloop.conf
deleted file mode 100644
index 6110037..0000000
--- a/servers/keymaker/docker-compose.d/custom/nginx/conf.d/rainloop.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-server {
-    listen 80;
-    server_name mail.ixvd.net;
-
-    location / {
-        proxy_pass http://rainloop:8888$request_uri;
-    }
-}
\ No newline at end of file
diff --git a/servers/keymaker/docker-compose.d/docker-compose.dms.yml b/servers/keymaker/docker-compose.d/docker-compose.dms.yml
deleted file mode 100644
index afeceb7..0000000
--- a/servers/keymaker/docker-compose.d/docker-compose.dms.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: '2.2'
-
-services:
-  mailserver:
-    image: ghcr.io/docker-mailserver/docker-mailserver:latest
-    container_name: mailserver
-    # Provide the FQDN of your mail server here (Your DNS MX record should point to this value)
-    hostname: mail.ixvd.net
-    env_file: ../../env/mailserver.env
-    # More information about the mail-server ports:
-    # https://docker-mailserver.github.io/docker-mailserver/latest/config/security/understanding-the-ports/
-    # To avoid conflicts with yaml base-60 float, DO NOT remove the quotation marks.
-    ports:
-      - "25:25"    # SMTP  (explicit TLS => STARTTLS)
-      - "143:143"  # IMAP4 (explicit TLS => STARTTLS)
-      - "465:465"  # ESMTP (implicit TLS)
-      - "587:587"  # ESMTP (explicit TLS => STARTTLS)
-      - "993:993"  # IMAP4 (implicit TLS)
-    volumes:
-      - /srv/mailserver/data:/var/mail/
-      - /srv/mailserver/config:/tmp/docker-mailserver/
-      - /srv/mailserver/other/state:/var/mail-state/
-      - /srv/mailserver/other/log/:/var/log/mail/
-      - /etc/localtime:/etc/localtime:ro
-      - /srv/certbot/data/live/mail.ixvd.net:/etc/letsencrypt/live/mail.ixvd.net
-    restart: always
-    stop_grace_period: 1m
-    # Uncomment if using `ENABLE_FAIL2BAN=1`:
-    # cap_add:
-    #   - NET_ADMIN
-    healthcheck:
-      test: "ss --listening --tcp | grep -P 'LISTEN.+:smtp' || exit 1"
-      timeout: 3s
-      retries: 0
diff --git a/servers/keymaker/docker-compose.d/docker-compose.rainloop.yml b/servers/keymaker/docker-compose.d/docker-compose.rainloop.yml
deleted file mode 100644
index b78498b..0000000
--- a/servers/keymaker/docker-compose.d/docker-compose.rainloop.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: '2.2'
-
-services:
-  rainloop:
-    image: hardware/rainloop
-    container_name: rainloop
-    depends_on:
-      - mailserver
-    volumes:
-      - /srv/rainloop/data:/rainloop/data
-    networks:
-      - proxy
-      - internal
-
-networks:
-  proxy:
-    external: true
-  internal:
-    external: true
\ No newline at end of file
diff --git a/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf b/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf
index 6f8a80f..18f1f8d 100644
--- a/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf
+++ b/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf
@@ -4,6 +4,10 @@ server {
 
     # SSL is managed by certbot, no need for a ssl listen; it will be generated automagically!
 
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
     # default html page
     location / {
         root /usr/share/nginx/html;