From bdb8f86848ca9764a70d76f45919d8ef9c835a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bojan=20=C4=8Cekrli=C4=87?= Date: Thu, 16 Jan 2025 22:46:45 +0100 Subject: [PATCH] Upd: Upgrade distro versions + fix a few typos --- build-scripts/postfix-install.sh | 10 ++++------ scripts/run.sh | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/build-scripts/postfix-install.sh b/build-scripts/postfix-install.sh index 67c10bc..a11d5bb 100644 --- a/build-scripts/postfix-install.sh +++ b/build-scripts/postfix-install.sh @@ -10,14 +10,12 @@ do_alpine() { apk add --upgrade cyrus-sasl cyrus-sasl-static cyrus-sasl-digestmd5 cyrus-sasl-crammd5 cyrus-sasl-login cyrus-sasl-ntlm libsasl apk add postfix postfix-pcre postfix-ldap apk add opendkim - apk add --upgrade ca-certificates tzdata supervisor rsyslog musl musl-utils bash opendkim-utils libcurl jsoncpp lmdb logrotate netcat-openbsd + apk add --upgrade ca-certificates tzdata supervisor rsyslog musl musl-utils bash opendkim-utils libcurl jsoncpp lmdb logrotate netcat-openbsd colorized-logs } + do_ubuntu() { - RELEASE_SPECIFIC_PACKAGES="netcat" - if [ "${ID}" = "debian" ]; then - RELEASE_SPECIFIC_PACKAGES="netcat-openbsd" - fi + RELEASE_SPECIFIC_PACKAGES="" export DEBCONF_NOWARNINGS=yes export DEBIAN_FRONTEND=noninteractive echo "Europe/Berlin" > /etc/timezone @@ -25,7 +23,7 @@ do_ubuntu() { apt-get install -y libsasl2-modules sasl2-bin apt-get install -y postfix postfix-pcre postfix-ldap apt-get install -y opendkim - apt-get install -y ca-certificates tzdata supervisor rsyslog bash opendkim-tools curl libcurl4 libjsoncpp25 sasl2-bin postfix-lmdb procps logrotate cron net-tools ${RELEASE_SPECIFIC_PACKAGES} + apt-get install -y ca-certificates tzdata supervisor rsyslog bash opendkim-tools curl libcurl4 libjsoncpp25 sasl2-bin postfix-lmdb procps logrotate cron net-tools colorized-logs netcat-openbsd ${RELEASE_SPECIFIC_PACKAGES} apt-get clean rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* } diff --git a/scripts/run.sh b/scripts/run.sh index 684925b..644d65d 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -15,7 +15,7 @@ setup_conf # Copy over files from /etc/postfix.temp reown_folders # Make and reown /var/spool/postfix/ folders postfix_enable_chroot # Allow Postfix to run in chroot postfix_upgrade_default_database_type # Compatibility layer. Debian still uses 'hash:', but newer distributions use 'lmbd:' -postfix_upgrade_conf # Upgrade old coniguration, replace "hash:" and "btree:" databases to "lmdb:" +postfix_upgrade_conf # Upgrade old configuration, replace "hash:" and "btree:" databases to "lmdb:" postfix_upgrade_daemon_directory # Change the 'daemon_directory' postfix configuration, if a change is detected from Alpine<->Debian/Ubuntu postfix_disable_utf8 # Disable SMTPUTF8, because libraries (ICU) are missing in alpine postfix_create_aliases # Update aliases database. It's not used, but postfix complains if the .db file is missing @@ -28,14 +28,14 @@ postfix_set_hostname # Set up host name postfix_set_relay_tls_level # Set TLS level security for relays postfix_setup_xoauth2_pre_setup # (Pre) Setup XOAUTH2 authentication postfix_setup_relayhost # Setup a relay host, if defined -postfix_setup_xoauth2_post_setup # (Post) Setup XOAUTH2 autentication +postfix_setup_xoauth2_post_setup # (Post) Setup XOAUTH2 authentication postfix_setup_networks # Set MYNETWORKS postfix_setup_debugging # Enable debugging, if defined postfix_setup_sender_domains # Configure allowed sender domains postfix_setup_masquarading # Setup masquaraded domains postfix_setup_header_checks # Enable SMTP header checks, if defined postfix_setup_dkim # Configure DKIM, if enabled -postfix_setup_smtpd_sasl_auth # Enable sender sasl auth, if defined +postfix_setup_smtpd_sasl_auth # Enable sender SASL auth, if defined postfix_custom_commands # Apply custom postfix settings opendkim_custom_commands # Apply custom OpenDKIM settings postfix_open_submission_port # Enable the submission port