From c21e2b175c604d35aaaabeaef733ba27191f58d5 Mon Sep 17 00:00:00 2001
From: Dmitry <ada.dmitry@gmail.com>
Date: Sun, 31 May 2026 12:39:04 +0300
Subject: [PATCH] Remove Maddy relay from mini-pc

---
 mini-pc/maddy/.env.example             |  6 -----
 mini-pc/maddy/docker-compose.yml       | 20 ---------------
 mini-pc/maddy/maddy.conf               | 34 --------------------------
 mini-pc/uptime-kuma/docker-compose.yml |  8 +-----
 mini-pc/vaultwarden/.env.example       |  8 +++---
 mini-pc/vaultwarden/docker-compose.yml |  5 ----
 nixos/hosts/mini-pc/firewall.nix       |  1 -
 7 files changed, 6 insertions(+), 76 deletions(-)
 delete mode 100644 mini-pc/maddy/.env.example
 delete mode 100644 mini-pc/maddy/docker-compose.yml
 delete mode 100644 mini-pc/maddy/maddy.conf

diff --git a/mini-pc/maddy/.env.example b/mini-pc/maddy/.env.example
deleted file mode 100644
index fb9cc21..0000000
--- a/mini-pc/maddy/.env.example
+++ /dev/null
@@ -1,6 +0,0 @@
-MADDY_HOSTNAME=mail.ada-dev.ru
-MADDY_DOMAIN=ada-dev.ru
-RELAY_ALLOWED_FROM=info.ada-dev@yandex.ru
-RELAY_SMTP_TARGET=tls://smtp.yandex.ru:465
-RELAY_SMTP_USERNAME=apikey
-RELAY_SMTP_PASSWORD=changeme
diff --git a/mini-pc/maddy/docker-compose.yml b/mini-pc/maddy/docker-compose.yml
deleted file mode 100644
index 6531ebb..0000000
--- a/mini-pc/maddy/docker-compose.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-services:
-  maddy:
-    image: foxcpp/maddy:0.8
-    container_name: maddy
-    hostname: maddy
-    restart: unless-stopped
-    ports:
-      - "2525:2525"
-    env_file:
-      - .env
-    volumes:
-      - /opt/data/maddy:/data
-      - ./maddy.conf:/data/maddy.conf:ro
-    networks:
-      - mail
-
-networks:
-  mail:
-    name: mail
-    driver: bridge
diff --git a/mini-pc/maddy/maddy.conf b/mini-pc/maddy/maddy.conf
deleted file mode 100644
index 2e6d599..0000000
--- a/mini-pc/maddy/maddy.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-hostname {env:MADDY_HOSTNAME}
-state_dir /data
-runtime_dir /run/maddy
-tls off
-
-target.queue outbound_queue {
-    location outbound_queue
-    max_tries 4
-    debug yes
-    target smtp {
-        debug yes
-        targets {env:RELAY_SMTP_TARGET}
-        auth plain {env:RELAY_SMTP_USERNAME} {env:RELAY_SMTP_PASSWORD}
-        starttls no
-    }
-}
-
-smtp tcp://0.0.0.0:2525 {
-    hostname {env:MADDY_HOSTNAME}
-    dmarc no
-    limits {
-        all rate 30 1m
-    }
-
-    source {env:RELAY_ALLOWED_FROM} {
-        default_destination {
-            deliver_to &outbound_queue
-        }
-    }
-
-    default_source {
-        reject 550 5.7.1 "Sender domain is not allowed"
-    }
-}
diff --git a/mini-pc/uptime-kuma/docker-compose.yml b/mini-pc/uptime-kuma/docker-compose.yml
index 00ab6f1..55b892c 100644
--- a/mini-pc/uptime-kuma/docker-compose.yml
+++ b/mini-pc/uptime-kuma/docker-compose.yml
@@ -10,10 +10,4 @@ services:
       TZ: Europe/Moscow
     volumes:
       - /opt/data/uptime-kuma:/app/data
-    networks:
-      - default
-      - mail
-networks:
-  default:
-  mail:
-    external: true
+networks: {}
diff --git a/mini-pc/vaultwarden/.env.example b/mini-pc/vaultwarden/.env.example
index 955ddda..e21efd0 100644
--- a/mini-pc/vaultwarden/.env.example
+++ b/mini-pc/vaultwarden/.env.example
@@ -1,6 +1,8 @@
 ADMIN_TOKEN=changeme
-SMTP_HOST=maddy
-SMTP_PORT=2525
-SMTP_SECURITY=off
+SMTP_HOST=smtp.yandex.ru
+SMTP_PORT=465
+SMTP_SECURITY=force_tls
+SMTP_USERNAME=info.ada-dev@yandex.ru
+SMTP_PASSWORD=changeme
 SMTP_FROM=info.ada-dev@yandex.ru
 SMTP_FROM_NAME=Vaultwarden
diff --git a/mini-pc/vaultwarden/docker-compose.yml b/mini-pc/vaultwarden/docker-compose.yml
index 2e7077c..5048f03 100644
--- a/mini-pc/vaultwarden/docker-compose.yml
+++ b/mini-pc/vaultwarden/docker-compose.yml
@@ -12,11 +12,6 @@ services:
       - type: bind
         source: /opt/data/vaultwarden
         target: /data
-    networks:
-      - default
-      - mail
 networks:
   default:
     name: vaultwarden_default
-  mail:
-    external: true
diff --git a/nixos/hosts/mini-pc/firewall.nix b/nixos/hosts/mini-pc/firewall.nix
index 789b0a3..7147815 100644
--- a/nixos/hosts/mini-pc/firewall.nix
+++ b/nixos/hosts/mini-pc/firewall.nix
@@ -8,7 +8,6 @@
       443 # HTTPS
       784 # DNS-over-QUIC
       853 # DNS-over-TLS
-      2525 # Maddy SMTP relay
       3001 # Uptime Kuma
       3015
       4438