saltstack-formulas/postfix-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap TLS and relay options in conditional blocks

Browse Source 
Basic setting enabling such feature enable the rest of the default statements.
This commit is contained in:
Gilles Dartiguelongue 2015-08-23 00:12:36 +02:00
parent 5e7d54b1f6
commit 542be4f5bb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
postfix/files/main.cf
View File

@ -37,15 +37,16 @@
{{ set_parameter('readme_directory', 'no') }} {{ set_parameter('readme_directory', 'no') }}
# TLS parameters {%- if config.get('smtpd_use_tls', 'yes') == 'yes' %}
# TLS parameters (http://www.postfix.org/TLS_README.html)
# Recipient settings
{{ set_parameter('smtpd_use_tls') }}
{{ set_parameter('smtpd_tls_cert_file', '/etc/ssl/certs/ssl-cert-snakeoil.pem') }} {{ set_parameter('smtpd_tls_cert_file', '/etc/ssl/certs/ssl-cert-snakeoil.pem') }}
{{ set_parameter('smtpd_tls_key_file', '/etc/ssl/private/ssl-cert-snakeoil.key') }} {{ set_parameter('smtpd_tls_key_file', '/etc/ssl/private/ssl-cert-snakeoil.key') }}
{{ set_parameter('smtpd_use_tls', 'yes') }}
{{ set_parameter('smtpd_tls_session_cache_database', 'btree:${data_directory}/smtpd_scache') }} {{ set_parameter('smtpd_tls_session_cache_database', 'btree:${data_directory}/smtpd_scache') }}
# Relay/Sender settings
{{ set_parameter('smtp_tls_session_cache_database', 'btree:${data_directory}/smtp_scache') }} {{ set_parameter('smtp_tls_session_cache_database', 'btree:${data_directory}/smtp_scache') }}
{%- endif %}
# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
# information on enabling SSL in the smtp client.
{{ set_parameter('myhostname', grains['fqdn']) }} {{ set_parameter('myhostname', grains['fqdn']) }}
{{ set_parameter('alias_maps', 'hash:' ~ postfix.aliases_file) }} {{ set_parameter('alias_maps', 'hash:' ~ postfix.aliases_file) }}
@ -58,6 +59,7 @@
{{ set_parameter('inet_interfaces', 'all') }} {{ set_parameter('inet_interfaces', 'all') }}
{{ set_parameter('message_size_limit', '41943040') }} {{ set_parameter('message_size_limit', '41943040') }}
{%- if config.get('relayhost') %}
{% set relay_restrictions = ['permit_mynetworks', 'permit_sasl_authenticated', 'defer_unauth_destination'] %} {% set relay_restrictions = ['permit_mynetworks', 'permit_sasl_authenticated', 'defer_unauth_destination'] %}
{% set policyd_spf = salt['pillar.get']('postfix:policyd-spf', {}) %} {% set policyd_spf = salt['pillar.get']('postfix:policyd-spf', {}) %}
{% if policyd_spf.get('enabled', False) %} {% if policyd_spf.get('enabled', False) %}
@ -65,6 +67,7 @@
policy-spf_time_limit = {{ policyd_spf.get('time_limit', '3600s') }} policy-spf_time_limit = {{ policyd_spf.get('time_limit', '3600s') }}
{% endif %} {% endif %}
{{ set_parameter('smtpd_relay_restrictions', relay_restrictions) }} {{ set_parameter('smtpd_relay_restrictions', relay_restrictions) }}
{%- endif %}
{% set recipient_restrictions = ['permit_mynetworks', 'permit_sasl_authenticated', 'reject_unauth_destination'] %} {% set recipient_restrictions = ['permit_mynetworks', 'permit_sasl_authenticated', 'reject_unauth_destination'] %}
{% set postgrey_config = salt['pillar.get']('postfix:postgrey', {}) %} {% set postgrey_config = salt['pillar.get']('postfix:postgrey', {}) %}