From eb17d056b7374bbcd1ffd82425634679ea3d0949 Mon Sep 17 00:00:00 2001
From: boban <boban.blaskovic@gmail.com>
Date: Sun, 26 Apr 2026 23:25:35 +0200
Subject: [PATCH] Fix: Sysmail-Domain basiert auf Mail-Domain
 (sysmail.<MTA_FQDN>)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Statt sysmail.<BASE_DOMAIN> wird jetzt sysmail.<MTA_SUB>.<BASE_DOMAIN> angelegt
(z.B. sysmail.mx.pxo.at statt sysmail.pxo.at) – Base-Domain des Users bleibt unangetastet.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 app/Livewire/Ui/System/SettingsForm.php | 8 +++++---
 database/seeders/SystemDomainSeeder.php | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Livewire/Ui/System/SettingsForm.php b/app/Livewire/Ui/System/SettingsForm.php
index def979c..4d8d345 100644
--- a/app/Livewire/Ui/System/SettingsForm.php
+++ b/app/Livewire/Ui/System/SettingsForm.php
@@ -199,11 +199,13 @@ class SettingsForm extends Component
             $this->applyDomains(false);
         }
 
-        // System-Domain (sysmail.<BASE_DOMAIN>) provisionieren, falls noch nicht vorhanden
+        // System-Domain (sysmail.<MAIL_DOMAIN>) provisionieren, falls noch nicht vorhanden
         $platformBase = config('mailpool.platform_zone', env('BASE_DOMAIN', ''));
         if ($platformBase && $platformBase !== 'example.com') {
-            $systemSub  = config('mailpool.platform_system_zone', 'sysmail');
-            $systemFqdn = strtolower("{$systemSub}.{$platformBase}");
+            $mtaSub     = strtolower(env('MTA_SUB', 'mx') ?: 'mx');
+            $systemSub  = strtolower(config('mailpool.platform_system_zone', 'sysmail'));
+            $serverFqdn = strtolower("{$mtaSub}.{$platformBase}");
+            $systemFqdn = strtolower("{$systemSub}.{$serverFqdn}");
             if (!\App\Models\Domain::where('domain', $systemFqdn)->exists()) {
                 try {
                     Artisan::call('db:seed', [
diff --git a/database/seeders/SystemDomainSeeder.php b/database/seeders/SystemDomainSeeder.php
index c2166da..562df38 100644
--- a/database/seeders/SystemDomainSeeder.php
+++ b/database/seeders/SystemDomainSeeder.php
@@ -28,8 +28,8 @@ class SystemDomainSeeder extends Seeder
         $mtaSub = strtolower(env('MTA_SUB', 'mx') ?: 'mx');            // z.B. mx
         $systemSub = strtolower(config('mailpool.platform_system_zone') ?: 'sysmail'); // z.B. sysmail
 
-        $serverFqdn = strtolower("{$mtaSub}.{$platformBase}");     // mx.nexlab.at
-        $systemFqdn = strtolower("{$systemSub}.{$platformBase}");  // sysmail.nexlab.at
+        $serverFqdn = strtolower("{$mtaSub}.{$platformBase}");          // mx.nexlab.at
+        $systemFqdn = strtolower("{$systemSub}.{$serverFqdn}");         // sysmail.mx.nexlab.at
 
         // =========================================================================
         // 1) MAILSERVER-DOMAIN zuerst (mx.<BASE_DOMAIN>), is_server = true