From b1e22ba18c73fff6d4ffb75e3830b783697bf54e Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Thu, 19 May 2022 21:38:54 +0200
Subject: [PATCH] Remove Traefik from docker-mailserver

---
 docker-mailserver/docker-compose.yml | 11 +----------
 rainloop/docker-compose.yml          | 18 ++----------------
 rainloop/traefik.yaml                |  1 -
 3 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 120000 rainloop/traefik.yaml

diff --git a/docker-mailserver/docker-compose.yml b/docker-mailserver/docker-compose.yml
index 65792b0..31b6ec8 100644
--- a/docker-mailserver/docker-compose.yml
+++ b/docker-mailserver/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - "587:587"
       - "993:993"
     volumes:
-      - ../rainloop/letsencrypt/acme.json:/etc/letsencrypt/acme.json:ro
+      - /var/lib/acme/mail.zweili.org:/etc/letsencrypt/live/:ro
       - maildata:/var/mail
       - mailstate:/var/mail-state
       - ./sa-learn:/etc/cron.d/sa-learn
@@ -23,15 +23,6 @@ services:
     restart: unless-stopped
     cap_add: ["NET_ADMIN", "SYS_PTRACE"]
 
-  whoami:
-    image: docker.io/traefik/whoami:latest
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.whoami.rule=Host(`mail.zweili.org`)"
-      - "traefik.http.routers.whoami.entrypoints=websecure"
-      - "traefik.http.routers.whoami.tls.certresolver=myresolver"
-      - "traefik.http.routers.whoami.middlewares=default-headers@file"
-
 volumes:
   maildata:
     driver_opts:
diff --git a/rainloop/docker-compose.yml b/rainloop/docker-compose.yml
index 6a01aa8..c16c512 100644
--- a/rainloop/docker-compose.yml
+++ b/rainloop/docker-compose.yml
@@ -1,27 +1,13 @@
 version: "2"
 
 services:
-  traefik:
-    image: "traefik:v2.2"
-    ports:
-      - "4430:443"
-    volumes:
-      - "./traefik.yaml:/etc/traefik/traefik.yaml:ro"
-      - "./letsencrypt:/letsencrypt"
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-    restart: unless-stopped
-
   rainloop:
     image: hiloyt/rainloop
     container_name: rainloop
     volumes:
       - rainloopdata:/rainloop/data
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.rainloop.rule=Host(`${APP_DOMAIN}`)"
-      - "traefik.http.routers.rainloop.entrypoints=websecure"
-      - "traefik.http.routers.rainloop.tls.certresolver=myresolver"
-      - "traefik.http.routers.rainloop.middlewares=default-headers@file"
+    ports:
+      - "8081:80"
     restart: unless-stopped
     links:
       - db:db
diff --git a/rainloop/traefik.yaml b/rainloop/traefik.yaml
deleted file mode 120000
index 22cc9b8..0000000
--- a/rainloop/traefik.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../traefik.yaml
\ No newline at end of file