server

commit 9b2ca840d5f0fa66002f787e761d3215de4fa586
parent b24046136919ec5b3acb8e9dce047f93156d6994
Author: Jack Sangdahl <jack@pngu.org>
Date:   Tue, 11 Feb 2025 14:30:26 -0700

Mail: stalwart + caddy updates

Diffstat:
M
caddy/Caddyfile
 | 
19
+++++++++++++------
M
caddy/compose.yaml
 | 
4
++++
A
stalwart/compose.yaml
 | 
33
+++++++++++++++++++++++++++++++++

3 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/caddy/Caddyfile b/caddy/Caddyfile
@@ -4,8 +4,15 @@
 
 www.pngu.org, pngu.org {
 	root * /srv/pngu.org
-    try_files {path}.html {path}
+	try_files {path}.html {path}
 	file_server
+	handle_errors {
+		@404 {
+			expression {http.error.status_code} == 404
+		}
+		rewrite @404 /404.html
+		file_server
+	}
 }
 
 vault.pngu.org {
@@ -24,14 +31,14 @@ uptime.pngu.org {
 	redir / /status/default
 }
 
-postfixadmin.pngu.org {
+mail.pngu.org {
 	encode zstd gzip
-	reverse_proxy 172.17.0.1:11004
+	reverse_proxy 172.17.0.1:8443
 }
 
-mail.pngu.org {
-	encode zstd gzip
-	reverse_proxy 172.17.0.1:11005
+webmail.pngu.org {
+    encode zstd gzip
+    reverse_proxy 172.17.0.1:11005
 }
 
 calendar.pngu.org {
diff --git a/caddy/compose.yaml b/caddy/compose.yaml
@@ -12,3 +12,7 @@ services:
       - /run/fcgiwrap.socket:/run/fcgiwrap.socket
       - /usr/share/cgit:/usr/share/cgit
       - /usr/share/misc_src:/usr/share/misc_src
+
+volumes:
+  data:
+  config:
diff --git a/stalwart/compose.yaml b/stalwart/compose.yaml
@@ -0,0 +1,33 @@
+services:
+  stalwart:
+    image: stalwartlabs/mail-server:latest
+    container_name: stalwart
+    restart: unless-stopped
+    ports:
+      - 8443:8443
+      - 25:25
+      - 587:587
+      - 465:465
+      - 143:143
+      - 993:993
+      - 110:110
+      - 995:995
+    volumes:
+      - data:/opt/stalwart-mail
+
+  db:
+    image: mariadb
+    container_name: stalwart_db
+    restart: unless-stopped
+    env_file: .env
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: yes
+      MARIADB_DATABASE: stalwart
+      MARIADB_USER: stalwart_user
+      MARIADB_PASSWORD: ${MARIADB_PASSWORD}
+    volumes:
+      - db:/var/lib/mysql
+
+volumes:
+  data:
+  db: