remove a few more mailu features

2 files changed, 5 insertions, 41 deletions

diff --git a/modules/mail/files/mailu.env b/modules/mail/files/mailu.env
index 2c4d571..e9e0a46 100644
--- a/modules/mail/files/mailu.env
+++ b/modules/mail/files/mailu.env
@@ -8,9 +8,9 @@ AUTH_RATELIMIT_USER=1000/day
 DISABLE_STATISTICS=True
 
 ADMIN=false
-WEBMAIL=snappymail
+WEBMAIL=none
 API=false
-WEBDAV=radicale
+WEBDAV=none
 ANTIVIRUS=none
 SCAN_MACROS=false
 
@@ -29,7 +29,7 @@ WELCOME_BODY=Welcome to your new email account, if you can read this, then it is
 COMPRESSION=
 COMPRESSION_LEVEL=
 
-WEBROOT_REDIRECT=/webmail
+WEBROOT_REDIRECT=
 WEB_ADMIN=/admin
 WEB_WEBMAIL=/webmail
 WEB_API=
diff --git a/modules/mail/templates/docker-compose.yml.erb b/modules/mail/templates/docker-compose.yml.erb
index bcd7554..666b4ad 100644
--- a/modules/mail/templates/docker-compose.yml.erb
+++ b/modules/mail/templates/docker-compose.yml.erb
@@ -1,12 +1,6 @@
-# This file is auto-generated by the Mailu configuration wizard.
-# Please read the documentation before attempting any change.
-# Generated for compose flavor
-
 version: '2.2'
 
 services:
-
-  # External dependencies
   redis:
     image: redis:alpine
     restart: always
@@ -17,7 +11,6 @@ services:
     dns:
       - 192.168.203.254
 
-  # Core services
   front:
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-2.0}
     restart: always
@@ -38,8 +31,6 @@ services:
       - "<%= @bind_address %>:993:993"
     networks:
       - default
-      - webmail
-      - radicale
     volumes:
       - "/media/persistent/certs:/certs"
       - "/media/persistent/overrides/nginx:/overrides:ro"
@@ -64,6 +55,8 @@ services:
       driver: journald
       options:
         tag: mailu-admin
+    ports:
+      - 127.0.0.1:8080:80
     volumes:
       - "/media/persistent/data:/data"
       - "/media/persistent/dkim:/dkim"
@@ -107,7 +100,6 @@ services:
     dns:
       - 192.168.203.254
 
-
   antispam:
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-2.0}
     hostname: antispam
@@ -127,30 +119,6 @@ services:
     dns:
       - 192.168.203.254
 
-  # Optional services
-
-  webdav:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-2.0}
-    restart: always
-    volumes:
-      - "/media/persistent/dav:/data"
-    networks:
-      - radicale
-
-
-  # Webmail
-  webmail:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}webmail:${MAILU_VERSION:-2.0}
-    restart: always
-    env_file: mailu.env
-    volumes:
-      - "/media/persistent/webmail:/data"
-      - "/media/persistent/overrides/snappymail:/overrides:ro"
-    networks:
-      - webmail
-    depends_on:
-      - front
-
 networks:
   default:
     driver: bridge
@@ -158,7 +126,3 @@ networks:
       driver: default
       config:
         - subnet: 192.168.203.0/24
-  radicale:
-    driver: bridge
-  webmail:
-    driver: bridge