From e974bb506eb85a73d326b9d165968dbb5da0d366 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Thu, 5 May 2022 22:32:54 +0200
Subject: [PATCH] Add NFS volume to mailserver

---
 docker-mailserver/docker-compose.yml | 17 ++++++++++++-----
 rainloop/docker-compose.yml          |  9 ++++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/docker-mailserver/docker-compose.yml b/docker-mailserver/docker-compose.yml
index 560fa7a..7572dd1 100644
--- a/docker-mailserver/docker-compose.yml
+++ b/docker-mailserver/docker-compose.yml
@@ -14,11 +14,11 @@ services:
       - "993:993"
     volumes:
       - ../rainloop/letsencrypt/acme.json:/etc/letsencrypt/acme.json:ro
-      - ./maildata:/var/mail
-      - ./mailstate:/var/mail-state
-      - ./sa-learn:/etc/cron.d/sa-learn
-      - ./maillogs:/var/log/mail
-      - ./config/:/tmp/docker-mailserver/
+      - mail/maildata:/var/mail
+      - mail/mailstate:/var/mail-state
+      - mail/sa-learn:/etc/cron.d/sa-learn
+      - mail/maillogs:/var/log/mail
+      - mail/config/:/tmp/docker-mailserver/
       - /etc/localtime:/etc/localtime:ro
     restart: unless-stopped
     cap_add: ["NET_ADMIN", "SYS_PTRACE"]
@@ -31,3 +31,10 @@ services:
       - "traefik.http.routers.whoami.entrypoints=websecure"
       - "traefik.http.routers.whoami.tls.certresolver=myresolver"
       - "traefik.http.routers.whoami.middlewares=default-headers@file"
+
+volumes:
+  mail:
+    driver_opts:
+      type: "nfs"
+      o: "addr=10.7.89.108,nolock,hard,rw,vers=4.1"
+      device: ":/server_data/ttrss/config"
diff --git a/rainloop/docker-compose.yml b/rainloop/docker-compose.yml
index da72891..d791150 100644
--- a/rainloop/docker-compose.yml
+++ b/rainloop/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     image: hiloyt/rainloop
     container_name: rainloop
     volumes:
-      - ./data:/rainloop/data
+      - mail/rainloopdata:/rainloop/data
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.rainloop.rule=Host(`${APP_DOMAIN}`)"
@@ -36,3 +36,10 @@ services:
       - MYSQL_PASSWORD
       - MYSQL_DATABASE
       - MYSQL_USER
+
+volumes:
+  mail:
+    driver_opts:
+      type: "nfs"
+      o: "addr=10.7.89.108,nolock,hard,rw,vers=4.1"
+      device: ":/server_data/ttrss/config"