Add matrix a few minor changes

docker-compose.yaml

@@ -2,6 +2,7 @@ include:
   - ./karakeep-compose.yaml
   - ./jellyfin-compose.yaml
   - ./immich-compose.yaml
+  - ./matrix-compose.yaml
 secrets:
   JWT_SECRET:
     file: '/data/authelia/secrets/JWT_SECRET'
@@ -54,9 +55,12 @@ networks:
   bitwarden:
     external: false
     enable_ipv6: true
-  # host:
-  #   external: true
-  #   enable_ipv6: true
+  immich:
+    external: false
+    enable_ipv6: true
+  matrix:
+    external: false
+    enable_ipv6: true
 services:
   web:
     build:
@@ -79,6 +83,8 @@ services:
       - gpodder
       - memos
       - bitwarden
+      - matrix
+      - immich
     depends_on:
       - jellyfin
       - ollama-webui
@@ -88,6 +94,7 @@ services:
       - gitea
       - gpodder
       - memos
+      - matrix-server
     logging: &logging
       options:
         max-size: "50m"
@@ -218,13 +225,46 @@ services:
     logging: *logging
     environment:
       - ALLOWED_SENDER_DOMAINS=loadingm.xyz
-      - POSTFIX_myhostname=mail
+      # - POSTFIX_myhostname=mail
+      - POSTFIX_myhostname=loadingm.xyz
+      - POSTFIX_mydestination=loadingm.xyz,loading-hpdl380g10.loadingm.xyz
+      - MASQUERADED_DOMAINS=loadingm.xyz,loading-hpdl380g10.loadingm.xyz
+      - SMTPD_SASL_USERS="a:123,b:123"
     volumes:
       - /data/mail:/etc/opendkim/keys
     networks:
       - mail
     ports:
       - 127.0.0.1:25:25
+  # mail:
+  #   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.loadingm.xyz
+  #   env_file: mailserver.env
+  #   # More information about the mail-server ports:
+  #   # https://docker-mailserver.github.io/docker-mailserver/latest/config/security/understanding-the-ports/
+  #   ports:
+  #     - "25:25"    # SMTP  (explicit TLS => STARTTLS, Authentication is DISABLED => use port 465/587 instead)
+  #     - "143:143"  # IMAP4 (explicit TLS => STARTTLS)
+  #     - "465:465"  # ESMTP (implicit TLS)
+  #     - "587:587"  # ESMTP (explicit TLS => STARTTLS)
+  #     - "993:993"  # IMAP4 (implicit TLS)
+  #   volumes:
+  #     - /data/dms/mail-data/:/var/mail/
+  #     - /data/dms/mail-state/:/var/mail-state/
+  #     - /data/dms/mail-logs/:/var/log/mail/
+  #     - /data/dms/config/:/tmp/docker-mailserver/
+  #     - /etc/localtime:/etc/localtime:ro
+  #   restart: always
+  #   stop_grace_period: 1m
+  #   # Uncomment if using `ENABLE_FAIL2BAN=1`:
+  #   # cap_add:
+  #   #   - NET_ADMIN
+  #   healthcheck:
+  #     test: "ss --listening --ipv4 --tcp | grep --silent ':smtp' || exit 1"
+  #     timeout: 3s
+  #     retries: 0
   bitwarden:
     # env_file:
     #   - bitwarden.env