Commit 64c0d8e9 authored by Phillip Smith (fukawi2)'s avatar Phillip Smith (fukawi2)
Browse files

postfix; remove unneeded directive from main.cf for relay client hosts

parent 4eb9d76f
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
- users.pcre - users.pcre
notify: notify:
- restart postfix - restart postfix
- postmap additional files
- update aliases db - update aliases db
- name: install additional files - name: install additional files
......
#
# {{ansible_managed}}
#
# Person who should get root's mail. Don't receive mail as root! # Person who should get root's mail. Don't receive mail as root!
root: root@archlinux.org root: root@archlinux.org
backup: root backup: root
......
#
# {{ansible_managed}}
#
compatibility_level = 2 compatibility_level = 2
smtpd_banner = $myhostname ESMTP $mail_name smtpd_banner = $myhostname ESMTP $mail_name
...@@ -73,14 +77,13 @@ debug_peer_list = ...@@ -73,14 +77,13 @@ debug_peer_list =
smtp_connection_cache_on_demand = yes smtp_connection_cache_on_demand = yes
smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
{% if postfix_smtpd_public %}
# custom restriction classes # custom restriction classes
policy_check = policy_check =
{% if postfix_smtpd_public %}
# postfwd (rate-limiting) # postfwd (rate-limiting)
check_policy_service inet:127.0.0.1:10040 check_policy_service inet:127.0.0.1:10040
{% endif %}
smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
smtpd_recipient_restrictions = smtpd_recipient_restrictions =
# policy services # policy services
...@@ -122,6 +125,7 @@ post_queue_smtpd_recipient_restrictions = ...@@ -122,6 +125,7 @@ post_queue_smtpd_recipient_restrictions =
check_sender_access ${indexed}/access_sender-post-filter, check_sender_access ${indexed}/access_sender-post-filter,
permit_mynetworks, permit_mynetworks,
reject reject
{% endif %}
address_verify_map = ${default_database_type}:/var/lib/postfix/verify_cache address_verify_map = ${default_database_type}:/var/lib/postfix/verify_cache
......
# #
# {{ansible_managed}}
#
#
# Postfix master process configuration file. For details on the format # Postfix master process configuration file. For details on the format
# of the file, see the master(5) manual page (command: "man 5 master" or # of the file, see the master(5) manual page (command: "man 5 master" or
# on-line: http://www.postfix.org/master.5.html). # on-line: http://www.postfix.org/master.5.html).
...@@ -104,6 +107,7 @@ scache unix - - n - 1 scache ...@@ -104,6 +107,7 @@ scache unix - - n - 1 scache
-o smtpd_tls_security_level=none -o smtpd_tls_security_level=none
{% endif %} {% endif %}
{% if postfix_server %}
# injection port that provides dkim signatures to mails coming in. same as above but milters enabled # injection port that provides dkim signatures to mails coming in. same as above but milters enabled
127.0.0.1:10027 inet n - n - - smtpd 127.0.0.1:10027 inet n - n - - smtpd
-o syslog_name=postfix/dkim-injector -o syslog_name=postfix/dkim-injector
...@@ -119,6 +123,7 @@ scache unix - - n - 1 scache ...@@ -119,6 +123,7 @@ scache unix - - n - 1 scache
-o smtpd_tls_auth_only=no -o smtpd_tls_auth_only=no
-o smtpd_reject_footer= -o smtpd_reject_footer=
-o smtpd_tls_security_level=none -o smtpd_tls_security_level=none
{% endif %}
{% if postfix_patchwork_enabled %} {% if postfix_patchwork_enabled %}
patchwork unix - n n - - pipe patchwork unix - n n - - pipe
......
#
# {{ansible_managed}}
#
{% if not postfix_patchwork_enabled %} {% if not postfix_patchwork_enabled %}
patchwork@archlinux.org smtp:[patchwork.archlinux.org] patchwork@archlinux.org smtp:[patchwork.archlinux.org]
{% endif %} {% endif %}
#
# {{ansible_managed}}
#
#lists.archlinux.org mailman: #lists.archlinux.org mailman:
{% if not postfix_relayhost %} {% if not postfix_relayhost %}
gmail.com smtp-ipv4: gmail.com smtp-ipv4:
......
#
# {{ansible_managed}}
#
{% if postfix_server %} {% if postfix_server %}
/wikibounce-[\w.]+-\w+-\w+-\w...............@archlinux.org/ wiki_bouncehandler: /wikibounce-[\w.]+-\w+-\w+-\w...............@archlinux.org/ wiki_bouncehandler:
{% endif %} {% endif %}
#
# {{ansible_managed}}
#
[bot_credentials] [bot_credentials]
username = {{wiki_bouncehandler_username}} username = {{wiki_bouncehandler_username}}
password = {{wiki_bouncehandler_password}} password = {{wiki_bouncehandler_password}}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment