From fdd17790f60d50eb135ba6a95cce9296a1deee77 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Sun, 4 Jan 2026 23:15:23 +0100
Subject: [PATCH] Do not install DMARC Report support on mail relay systems.

---
 install_postfix_advanced.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/install_postfix_advanced.sh b/install_postfix_advanced.sh
index d7d0c89..bc6ca37 100755
--- a/install_postfix_advanced.sh
+++ b/install_postfix_advanced.sh
@@ -452,8 +452,8 @@ else
 fi
 
 
+INSTALL_DMARC_REPORT_SUPPORT=false
 if ! ${IS_RELAY_HOST} ; then
-   INSTALL_DMARC_REPORT_SUPPORT=false
    echo ""
    echo -e "\033[32m--\033[m"
    echo ""
@@ -580,9 +580,6 @@ fi
 
 [[ "$IPV6" = "disabled" ]] && IPV6=""
 
-exit
-clean_up 1
-
 
 # - Synchronise package index files with the repository
 # -
@@ -3827,7 +3824,8 @@ if ${INSTALL_DMARC_REPORT_SUPPORT} ; then
    # -   ├── processed/               # Originalmails (Archiv)
    # -   ├── exports/                 # CSV- und Top-Auswertungen
    # -   └── logs/                    # Logdateien
-   echononl "Add directory Structure for collecting and analysing DMARC reports.."
+   echo ""
+   echononl "   Add directory Structure for collecting and analysing DMARC reports.."
    install -d -o vmail -g vmail -m 750 /var/lib/dmarc/{reports,processed,exports,logs} > /dev/null 2> $log_file
    if [[ $? -eq 0 ]] ; then
       echo_ok
@@ -3836,7 +3834,7 @@ if ${INSTALL_DMARC_REPORT_SUPPORT} ; then
       error "$(cat $log_file)"
    fi
 
-   echononl "Add 'dmarc-pipe' entry to $postfix_master_cf .."
+   echononl "   Add 'dmarc-pipe' entry to $postfix_master_cf .."
    cat <<EOF >> /etc/postfix/transport 2> $log_file
 
 # - Take care your master.cf file ($postfix_master_cf) contains:
@@ -3854,7 +3852,7 @@ EOF
       error "$(cat $log_file)"
    fi
 
-   echononl "Create Postfix lookup table '/etc/postfix/transport'.."
+   echononl "   Create Postfix lookup table '/etc/postfix/transport'.."
    postmap btree:/etc/postfix/transport > /dev/null 2> $log_file
    if [[ $? -eq 0 ]] ; then
       echo_ok
@@ -3863,7 +3861,7 @@ EOF
       error "$(cat $log_file)"
    fi
 
-   echononl "Create script '/usr/local/bin/dmarc-collect.sh'.."
+   echononl "   Create script '/usr/local/bin/dmarc-collect.sh'.."
    tee /usr/local/bin/dmarc-collect.sh > /dev/null 2> $log_file <<'EOF'
 #!/usr/bin/env bash
 set -euo pipefail
@@ -3921,7 +3919,7 @@ EOF
    fi
 
    _failed=false
-   echononl "Set permissions for '/usr/local/bin/dmarc-collect.sh'.."
+   echononl "   Set permissions for '/usr/local/bin/dmarc-collect.sh'.."
    chown vmail:vmail /usr/local/bin/dmarc-collect.sh > /dev/null 2> $log_file
    if [[ $? -ne 0 ]] ; then
       _failed=true