Refactor: Remove socketmap handler and thunder integration

services/config-scripts/gen-postfix-conf.sh

@@ -22,15 +22,15 @@ MAIL_HOSTNAME=${MAIL_HOSTNAME:-mail.$MAIL_DOMAIN}
 
 mkdir -p ${CONFIGS_PATH}
 
-# Note: Using socketmap service for all virtual maps
+# Note: Using Raven-hosted socketmap service for all virtual maps
 # - Virtual domains: validates which domains we accept mail for
 # - Virtual users: validates which user mailboxes exist
 # - Virtual aliases: resolves email aliases to destination addresses
 
 echo -e "SMTP configuration will use:"
-echo " - Socketmap for domains: socketmap-server:9100"
-echo " - Socketmap for users: socketmap-server:9100"
-echo " - Socketmap for aliases: socketmap-server:9100"
+echo " - Socketmap for domains: raven:9100"
+echo " - Socketmap for users: raven:9100"
+echo " - Socketmap for aliases: raven:9100"
 
 # --- Generate main.cf content ---
 cat >"${CONFIGS_PATH}/main.cf" <<EOF
@@ -126,10 +126,10 @@ smtpd_sasl_auth_enable = yes
 smtpd_sasl_security_options = noanonymous
 broken_sasl_auth_clients = yes
 
-# Virtual mailbox configuration - socketmap based
-virtual_mailbox_domains = socketmap:inet:socketmap-server:9100:virtual-domains
-virtual_mailbox_maps = socketmap:inet:socketmap-server:9100:user-exists
-virtual_alias_maps = socketmap:inet:socketmap-server:9100:virtual-aliases
+# Virtual mailbox configuration - socketmap served by Raven
+virtual_mailbox_domains = socketmap:inet:raven:9100:virtual-domains
+virtual_mailbox_maps = socketmap:inet:raven:9100:user-exists
+virtual_alias_maps = socketmap:inet:raven:9100:virtual-aliases
 
 # Set mailbox base to tell Postfix we're managing mailboxes
 # This ensures reject_unlisted_recipient properly checks virtual_mailbox_maps

services/docker-compose.yaml

@@ -8,9 +8,6 @@ services:
     volumes:
       - ./silver-config/postfix/main.cf:/etc/postfix/main.cf:ro
       - ./silver-config/postfix/master.cf:/etc/postfix/master.cf:ro
-      - ./silver-config/postfix/sqlite-virtual-domains.cf:/etc/postfix/sqlite-virtual-domains.cf:ro
-      - ./silver-config/postfix/sqlite-virtual-users.cf:/etc/postfix/sqlite-virtual-users.cf:ro
-      - ./silver-config/postfix/sqlite-virtual-aliases.cf:/etc/postfix/sqlite-virtual-aliases.cf:ro
       - ../conf/silver.yaml:/etc/postfix/silver.yaml
       - ./silver-config/certbot/keys/etc:/etc/letsencrypt:ro
       - ./silver-config/raven/data:/app/data:rw
@@ -27,8 +24,6 @@ services:
         condition: service_started
       raven-server:
         condition: service_started
-      socketmap-server:
-        condition: service_healthy
 
   raven-server:
     image: ghcr.io/lsflk/raven:latest
@@ -38,56 +33,29 @@ services:
       - "993:993"
       - "24:24"
       - "12345:12345"
+      - "9100:9100"
     volumes:
       - ./silver-config/raven/conf:/etc/raven:rw
       - ./silver-config/raven/data:/app/data:rw
       - ./silver-config/raven/certs:/certs:ro
-    environment:
-      - DB_FILE=/app/data/databases/shared.db
-    networks:
-      - mail-network
-    restart: unless-stopped
-    user: "0:0"
-
-  socketmap-server:
-    build:
-      context: ./socketmap
-      dockerfile: Dockerfile
-    container_name: socketmap-server
-    expose:
-      - "9100"
-    volumes:
-      # Mount Docker socket to allow reading thunder-setup logs
       - /var/run/docker.sock:/var/run/docker.sock:ro
-    networks:
-      - mail-network
-    restart: unless-stopped
-    user: "0:0"
     environment:
+      - DB_FILE=/app/data/databases/shared.db
       - SOCKETMAP_HOST=0.0.0.0
       - SOCKETMAP_PORT=9100
-      # THUNDER_DEVELOP_APP_ID not required - auto-extracted from thunder-setup logs
       - THUNDER_HOST=thunder-server
       - THUNDER_PORT=8090
       - CACHE_TTL_SECONDS=300
       - TOKEN_REFRESH_SECONDS=3300
+    networks:
+      - mail-network
     depends_on:
       thunder-setup:
         condition: service_completed_successfully
       thunder:
         condition: service_started
-    healthcheck:
-      test: ["CMD", "nc", "-z", "localhost", "9100"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-      start_period: 5s
-    deploy:
-      resources:
-        limits:
-          memory: 128M
-        reservations:
-          memory: 64M
+    restart: unless-stopped
+    user: "0:0"
 
   opendkim-server:
     image: ghcr.io/lsflk/silver-dkim:main