From b321a94b743f0002d1d1d839e935b9d8b6d014d9 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 25 Apr 2020 02:26:48 -0400
Subject: update mailu

---
 modules/mail/files/mailu.env                  |  2 +-
 modules/mail/templates/docker-compose.yml.erb | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'modules/mail')

diff --git a/modules/mail/files/mailu.env b/modules/mail/files/mailu.env
index 1d44d71..0bcb8e9 100644
--- a/modules/mail/files/mailu.env
+++ b/modules/mail/files/mailu.env
@@ -1,4 +1,4 @@
-VERSION=1.6
+MAILU_VERSION=1.7
 SUBNET=192.168.203.0/24
 DOMAIN=tozt.net
 HOSTNAMES=mail.tozt.net
diff --git a/modules/mail/templates/docker-compose.yml.erb b/modules/mail/templates/docker-compose.yml.erb
index 942c50b..f31c1cf 100644
--- a/modules/mail/templates/docker-compose.yml.erb
+++ b/modules/mail/templates/docker-compose.yml.erb
@@ -2,7 +2,7 @@
 # Please read the documentation before attempting any change.
 # Generated for compose flavor
 
-version: '3.6'
+version: '2.2'
 
 services:
 
@@ -15,7 +15,7 @@ services:
     
   # Core services
   front:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-1.6}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     logging:
@@ -35,7 +35,7 @@ services:
       - "/media/persistent/overrides/nginx:/overrides"
 
   resolver:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-1.6}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-1.7}
     env_file: mailu.env
     restart: always
     networks:
@@ -43,7 +43,7 @@ services:
         ipv4_address: 192.168.203.254
 
   admin:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-1.6}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -53,21 +53,17 @@ services:
       - redis
 
   imap:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-1.6}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
       - "/media/persistent/mail:/mail"
       - "/media/persistent/overrides:/overrides"
-      <%# - "/media/persistent/overrides/patch/learn.sieve:/conf/learn.sieve" %>
-      <%# - "/media/persistent/overrides/patch/dovecot.conf:/conf/dovecot.conf" %>
-      <%# - "/media/persistent/overrides/patch/ham:/conf/bin/ham" %>
-      <%# - "/media/persistent/overrides/patch/spam:/conf/bin/spam" %>
     depends_on:
       - front
 
   smtp:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-1.6}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -79,7 +75,7 @@ services:
       - 192.168.203.254
 
   antispam:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-1.6}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -95,7 +91,7 @@ services:
   # Optional services
 
   webdav:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-1.6}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -104,7 +100,7 @@ services:
 
   # Webmail
   webmail:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rainloop:${MAILU_VERSION:-1.6}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rainloop:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
-- 
cgit v1.2.3-54-g00ecf