Merge branch 'master' of https://git.oopen.de/install/mailsystem

install_amavis.sh

@@ -218,6 +218,9 @@ elif [[ "${os_dist,,}" = "debian" ]] && [[ "$os_version" -eq 11 ]] ; then
 elif [[ "${os_dist,,}" = "debian" ]] && [[ "$os_version" -eq 12 ]] ; then
 	_needed_packages_clamav="$_needed_packages_clamav \
    libclamunrar11"
+elif [[ "${os_dist,,}" = "debian" ]] && [[ "$os_version" -eq 13 ]] ; then
+	_needed_packages_clamav="$_needed_packages_clamav \
+   libclamunrar12"
 else
    _needed_packages_clamav="$_needed_packages_clamav \
    libclamunrar13"
@@ -233,7 +236,6 @@ _needed_decoders_amavis="
    cpio\
    lhasa \
    lzop \
-   liblz4-tool \
    lrzip \
    melt \
    nomarch \
@@ -250,6 +252,11 @@ _needed_decoders_amavis="
    unzip \
    zip "
 
+if [[ "${os_dist,,}" = "debian" ]] && [[ "$os_version" -lt 12 ]] ; then
+	_needed_decoders_amavis="$_needed_decoders_amavis  \
+   liblz4-tool"
+fi
+
 if [[ "${os_dist,,}" = "debian" ]] && [[ "$os_version" -lt 10 ]] ; then
 	_needed_decoders_amavis="$_needed_decoders_amavis  \
    ripole \
@@ -3934,7 +3941,7 @@ installation_failed=false
 _needed_cpan_modules="
    Digest::SHA1
    Digest::SHA2
-   Digest::SHA256
+   Digest::SHA
    Encode::Detect
    Net::Patricia"
 for _module in $_needed_cpan_modules ; do

install_postfix_advanced.sh

@@ -452,8 +452,8 @@ else
 fi
 
 
-if ! ${IS_RELAY_HOST} ; then
 INSTALL_DMARC_REPORT_SUPPORT=false
+if ! ${IS_RELAY_HOST} ; then
    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,6 +3824,7 @@ if ${INSTALL_DMARC_REPORT_SUPPORT} ; then
    # -   ├── processed/               # Originalmails (Archiv)
    # -   ├── exports/                 # CSV- und Top-Auswertungen
    # -   └── logs/                    # Logdateien
+   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