From 88cd244e47411fe7250a6315a19781ffc5a97806 Mon Sep 17 00:00:00 2001 From: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> Date: Sun, 23 Apr 2023 12:16:53 +0200 Subject: [PATCH] scripts: misc improvements (#3281) * corrected typo * corrected indentation --- target/scripts/startup/setup.d/dmarc_dkim_spf.sh | 11 +++++------ target/scripts/startup/setup.d/security/misc.sh | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/target/scripts/startup/setup.d/dmarc_dkim_spf.sh b/target/scripts/startup/setup.d/dmarc_dkim_spf.sh index 2401fce4..28258988 100644 --- a/target/scripts/startup/setup.d/dmarc_dkim_spf.sh +++ b/target/scripts/startup/setup.d/dmarc_dkim_spf.sh @@ -98,12 +98,11 @@ policyd-spf unix - n n - 0 spawn user=policyd-spf argv=/usr/bin/policyd-spf EOF - sedfile -i -E \ - 's|^(smtpd_recipient_restrictions.*reject_unauth_destination)(.*)|\1, check_policy_service unix:private/policyd-spf\2|' \ - /etc/postfix/main.cf - # SPF policy settings - postconf 'policyd-spf_time_limit = 3600' - + # SPF policy settings + postconf 'policyd-spf_time_limit = 3600' + sedfile -i -E \ + 's|^(smtpd_recipient_restrictions.*reject_unauth_destination)(.*)|\1, check_policy_service unix:private/policyd-spf\2|' \ + /etc/postfix/main.cf else _log 'debug' 'Disabling policyd-spf' fi diff --git a/target/scripts/startup/setup.d/security/misc.sh b/target/scripts/startup/setup.d/security/misc.sh index 085b632b..b517d513 100644 --- a/target/scripts/startup/setup.d/security/misc.sh +++ b/target/scripts/startup/setup.d/security/misc.sh @@ -52,7 +52,7 @@ function __setup__security__postgrey cp -f /tmp/docker-mailserver/whitelist_recipients /etc/postgrey/whitelist_recipients fi else - _log 'debug' 'Postscreen is disabled' + _log 'debug' 'Postgrey is disabled' fi }