Compare commits

..

2 Commits

2 changed files with 15 additions and 11 deletions

View File

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

View File

@@ -452,8 +452,8 @@ else
fi fi
if ! ${IS_RELAY_HOST} ; then
INSTALL_DMARC_REPORT_SUPPORT=false INSTALL_DMARC_REPORT_SUPPORT=false
if ! ${IS_RELAY_HOST} ; then
echo "" echo ""
echo -e "\033[32m--\033[m" echo -e "\033[32m--\033[m"
echo "" echo ""
@@ -580,9 +580,6 @@ fi
[[ "$IPV6" = "disabled" ]] && IPV6="" [[ "$IPV6" = "disabled" ]] && IPV6=""
exit
clean_up 1
# - Synchronise package index files with the repository # - Synchronise package index files with the repository
# - # -
@@ -3827,6 +3824,7 @@ if ${INSTALL_DMARC_REPORT_SUPPORT} ; then
# - ├── processed/ # Originalmails (Archiv) # - ├── processed/ # Originalmails (Archiv)
# - ├── exports/ # CSV- und Top-Auswertungen # - ├── exports/ # CSV- und Top-Auswertungen
# - └── logs/ # Logdateien # - └── logs/ # Logdateien
echo ""
echononl " Add directory Structure for collecting and analysing DMARC reports.." 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 install -d -o vmail -g vmail -m 750 /var/lib/dmarc/{reports,processed,exports,logs} > /dev/null 2> $log_file
if [[ $? -eq 0 ]] ; then if [[ $? -eq 0 ]] ; then