Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
infrastructure
Commits
64c0d8e9
Commit
64c0d8e9
authored
Oct 30, 2019
by
Phillip Smith (fukawi2)
Browse files
postfix; remove unneeded directive from main.cf for relay client hosts
parent
4eb9d76f
Changes
9
Hide whitespace changes
Inline
Side-by-side
roles/postfix/tasks/main.yml
View file @
64c0d8e9
...
...
@@ -17,6 +17,7 @@
-
users.pcre
notify
:
-
restart postfix
-
postmap additional files
-
update aliases db
-
name
:
install additional files
...
...
roles/postfix/templates/aliases.j2
View file @
64c0d8e9
#
# {{ansible_managed}}
#
# Person who should get root's mail. Don't receive mail as root!
root: root@archlinux.org
backup: root
...
...
roles/postfix/templates/main.cf.j2
View file @
64c0d8e9
#
# {{ansible_managed}}
#
compatibility_level = 2
smtpd_banner = $myhostname ESMTP $mail_name
...
...
@@ -73,14 +77,13 @@ debug_peer_list =
smtp_connection_cache_on_demand = yes
smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
{% if postfix_smtpd_public %}
# custom restriction classes
policy_check =
{% if postfix_smtpd_public %}
# postfwd (rate-limiting)
check_policy_service inet:127.0.0.1:10040
{% endif %}
smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
smtpd_recipient_restrictions =
# policy services
...
...
@@ -122,6 +125,7 @@ post_queue_smtpd_recipient_restrictions =
check_sender_access ${indexed}/access_sender-post-filter,
permit_mynetworks,
reject
{% endif %}
address_verify_map = ${default_database_type}:/var/lib/postfix/verify_cache
...
...
roles/postfix/templates/master.cf.j2
View file @
64c0d8e9
#
# {{ansible_managed}}
#
#
# Postfix master process configuration file. For details on the format
# of the file, see the master(5) manual page (command: "man 5 master" or
# on-line: http://www.postfix.org/master.5.html).
...
...
@@ -104,6 +107,7 @@ scache unix - - n - 1 scache
-o smtpd_tls_security_level=none
{% endif %}
{% if postfix_server %}
# 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
-o syslog_name=postfix/dkim-injector
...
...
@@ -119,6 +123,7 @@ scache unix - - n - 1 scache
-o smtpd_tls_auth_only=no
-o smtpd_reject_footer=
-o smtpd_tls_security_level=none
{% endif %}
{% if postfix_patchwork_enabled %}
patchwork unix - n n - - pipe
...
...
roles/postfix/templates/relay_transport_map.j2
View file @
64c0d8e9
#
# {{ansible_managed}}
#
{% if not postfix_patchwork_enabled %}
patchwork@archlinux.org smtp:[patchwork.archlinux.org]
{% endif %}
roles/postfix/templates/transport.j2
View file @
64c0d8e9
#
# {{ansible_managed}}
#
#lists.archlinux.org mailman:
{% if not postfix_relayhost %}
gmail.com smtp-ipv4:
...
...
roles/postfix/templates/transport.pcre.j2
View file @
64c0d8e9
#
# {{ansible_managed}}
#
{% if postfix_server %}
/wikibounce-[\w.]+-\w+-\w+-\w...............@archlinux.org/ wiki_bouncehandler:
{% endif %}
roles/postfix/templates/users.pcre.j2
View file @
64c0d8e9
#
# {{ansible_managed}}
#
roles/postfix/templates/wiki-bouncehandler.conf.j2
View file @
64c0d8e9
#
# {{ansible_managed}}
#
[bot_credentials]
username = {{wiki_bouncehandler_username}}
password = {{wiki_bouncehandler_password}}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment