diff --git a/roles/postfix/files/access_client b/roles/postfix/files/access_client deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/roles/postfix/files/access_helo b/roles/postfix/files/access_helo deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/roles/postfix/files/access_recipient b/roles/postfix/files/access_recipient deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/roles/postfix/files/access_sender b/roles/postfix/files/access_sender deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/roles/postfix/files/access_sender-post-filter b/roles/postfix/files/access_sender-post-filter deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/roles/postfix/files/body_checks b/roles/postfix/files/body_checks deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/roles/postfix/files/header_checks b/roles/postfix/files/header_checks deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/roles/postfix/files/relocated b/roles/postfix/files/relocated deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/roles/postfix/handlers/main.yml b/roles/postfix/handlers/main.yml index d0e8056d930f2177efc36be4f082ed407d11bc65..38f49a9028fda0626df165eedb52393080365d45 100644 --- a/roles/postfix/handlers/main.yml +++ b/roles/postfix/handlers/main.yml @@ -9,13 +9,7 @@ - name: Postmap additional files # noqa no-changed-when command: postmap /etc/postfix/{{ item }} loop: - - access_client - - access_sender - - access_sender-post-filter - - access_helo - - access_recipient - transport - - relocated - domains - msa_header_checks diff --git a/roles/postfix/tasks/main.yml b/roles/postfix/tasks/main.yml index eb1e2227a9260bbd3dccfe39a1da554117e50d32..0926f25c6870d31ae70df4df86cff548efb91507 100644 --- a/roles/postfix/tasks/main.yml +++ b/roles/postfix/tasks/main.yml @@ -9,7 +9,6 @@ - transport - transport.pcre - aliases - - users.pcre notify: - Restart postfix - Postmap additional files @@ -18,14 +17,6 @@ - name: Install additional files copy: src={{ item }} dest=/etc/postfix/{{ item }} owner=root group=root mode=0644 loop: - - access_client - - access_sender - - access_sender-post-filter - - access_helo - - access_recipient - - body_checks - - header_checks - - relocated - domains - msa_header_checks notify: diff --git a/roles/postfix/templates/main.cf.j2 b/roles/postfix/templates/main.cf.j2 index 6633dc7a389f1773a21c11cf974e6f6502106f9d..08f14dea11b6b16e10fb6a9ecff08be8383eb31c 100644 --- a/roles/postfix/templates/main.cf.j2 +++ b/roles/postfix/templates/main.cf.j2 @@ -78,10 +78,6 @@ smtpd_recipient_restrictions = # policy services $policy_check, # white-/blacklisting - check_recipient_access ${indexed}/access_recipient, - check_client_access ${indexed}/access_client, - check_helo_access ${indexed}/access_helo, - check_sender_access ${indexed}/access_sender, # reject unclean mails reject_unauth_pipelining, reject_non_fqdn_recipient, @@ -130,7 +126,6 @@ smtpd_sasl_authenticated_header = yes submission_recipient_restrictions= # allow postmaster - check_recipient_access ${indexed}/access_recipient, permit_sasl_authenticated, reject @@ -156,7 +151,6 @@ alias_database = ${indexed}/aliases virtual_alias_maps = ${indexed}/users - pcre:${config_directory}/users.pcre virtual_alias_domains = ${indexed}/domains # reject mails to system users (nobody looks in those mailboxes) @@ -164,7 +158,6 @@ local_recipient_maps = ${indexed}/users $alias_maps pcre:${config_directory}/transport.pcre -relocated_maps = ${indexed}/relocated relay_domains = @@ -176,9 +169,6 @@ wiki_bouncehandler_destination_recipient_limit = 1 authorized_mailq_users = root -header_checks = pcre:/etc/postfix/header_checks -body_checks = pcre:/etc/postfix/body_checks - delay_warning_time = 4h # vim: set ft=pfmain: diff --git a/roles/postfix/templates/users.pcre.j2 b/roles/postfix/templates/users.pcre.j2 deleted file mode 100644 index 3d684f24bef43ee7ac0bac8d1dc747ce34c7d771..0000000000000000000000000000000000000000 --- a/roles/postfix/templates/users.pcre.j2 +++ /dev/null @@ -1,4 +0,0 @@ -# -# {{ansible_managed}} -# -