updated packages lists and added comments for maintainability

CHANGELOG.md

@@ -22,9 +22,11 @@ All notable changes to this project will be documented in this file. The format
   - updated note about Rspamd on ARM64 lacking behind in version
 - **Internal:**
   - Postfix configures `virtual_mailbox_maps` and `virtual_transport` during startup instead of using defaults (configured for Dovecot) via our `main.cf` ([#3681](https://github.com/docker-mailserver/docker-mailserver/pull/3681))
-  - `packages.sh` now uses `/etc/os-release` to determine the release name of Debian
+  - updates to `packages.sh`
-  - removed custom installations of Fail2Ban, getmail6 and Rspamd
+    - the script now uses `/etc/os-release` to determine the release name of Debian
-  - use official Rspamd PPA on AMD64; no PPA is used on ARM64
+    - removed custom installations of Fail2Ban, getmail6 and Rspamd
+    - updated packages lists and added comments for maintainability
+    - use official Rspamd PPA on AMD64; no PPA is used on ARM64
 
 ### Fixed
 

target/scripts/build/packages.sh

@@ -50,7 +50,7 @@ function _install_utils() {
 function _install_postfix() {
   _log 'debug' 'Installing Postfix'
 
-  _log 'warn' 'Applying workaround for Postfix bug (see https://github.com//issues/2023#issuecomment-855326403)'
+  _log 'warn' 'Applying workaround for Postfix bug (see https://github.com/docker-mailserver/docker-mailserver/issues/2023#issuecomment-855326403)'
 
   # Debians postfix package has a post-install script that expects a valid FQDN hostname to work:
   mv /bin/hostname /bin/hostname.bak
@@ -66,12 +66,19 @@ function _install_postfix() {
 function _install_packages() {
   _log 'debug' 'Installing all packages now'
 
-  ANTI_VIRUS_SPAM_PACKAGES=(
+  local ANTI_VIRUS_SPAM_PACKAGES=(
-    amavisd-new clamav clamav-daemon
+    clamav clamav-daemon
-    pyzor razor spamassassin
+    # spamassassin is used only with amavisd-new and pyzor/razor
+    # are used by spamassasin
+    amavisd-new spamassassin pyzor razor
+    # the following packages are all for Fail2Ban
+    fail2ban python3-pyinotify python3-dnspython
+    # redis-server belongs to rspamd
+    rspamd redis-server
   )
 
-  CODECS_PACKAGES=(
+  # predominatly for Amavis support
+  local CODECS_PACKAGES=(
     altermime arj bzip2
     cabextract cpio file
     gzip lhasa liblz4-tool
@@ -80,26 +87,33 @@ function _install_packages() {
     unrar-free unzip xz-utils
   )
 
-  MISCELLANEOUS_PACKAGES=(
+  local MISCELLANEOUS_PACKAGES=(
-    apt-transport-https binutils bsd-mailx
+    binutils bsd-mailx
-    ca-certificates curl dbconfig-no-thanks
+    dbconfig-no-thanks dumb-init iproute2
-    dumb-init gnupg iproute2 libdate-manip-perl
+    libdate-manip-perl libldap-common libmail-spf-perl libnet-dns-perl
-    libldap-common libmail-spf-perl
+    locales logwatch netcat-openbsd
-    libnet-dns-perl locales logwatch
+    nftables # primarily for Fail2Ban
-    netcat-openbsd nftables rsyslog
+    rsyslog supervisor
-    supervisor uuid whois
+    uuid # used for file-locking
+    whois
   )
 
-  POSTFIX_PACKAGES=(
+  local POSTFIX_PACKAGES=(
     pflogsumm postgrey postfix-ldap
     postfix-pcre postfix-policyd-spf-python postsrsd
   )
 
-  MAIL_PROGRAMS_PACKAGES=(
+  local MAIL_PROGRAMS_PACKAGES=(
-    fetchmail opendkim opendkim-tools
+    opendkim opendkim-tools
     opendmarc libsasl2-modules sasl2-bin
   )
 
+  # these packages are contributed by the community and not part
+  # of DMS' core set of package
+  local COMMUNITY_PACKAGES=(
+    fetchmail getmail6
+  )
+
   # `bind9-dnsutils` provides the `dig` command
   # `iputils-ping` provides the `ping` command
   DEBUG_PACKAGES=(
@@ -112,7 +126,8 @@ function _install_packages() {
     "${MISCELLANEOUS_PACKAGES[@]}" \
     "${POSTFIX_PACKAGES[@]}" \
     "${MAIL_PROGRAMS_PACKAGES[@]}" \
-    "${DEBUG_PACKAGES[@]}"
+    "${DEBUG_PACKAGES[@]}" \
+    "${COMMUNITY_PACKAGES[@]}"
 }
 
 function _install_dovecot() {
@@ -155,6 +170,10 @@ function _post_installation_steps() {
   apt-get "${QUIET}" clean
   rm -rf /var/lib/apt/lists/*
 
+  _log 'debug' 'Patching Fail2ban to enable network bans'
+  # Enable network bans
+  # https://github.com/docker-mailserver/docker-mailserver/issues/2669
+  sedfile -i -r 's/^_nft_add_set = .+/_nft_add_set = <nftables> add set <table_family> <table> <addr_set> \\{ type <addr_type>\\; flags interval\\; \\}/' /etc/fail2ban/action.d/nftables.conf
 }
 
 _pre_installation_steps