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

Merge pull request #21 from imran1008/submission

Browse Source 
Enable submission service by default
This commit is contained in:
Nitin Madhok 2015-08-09 08:04:35 -04:00
commit c594c1df41
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pillar.example
View File

@ -1,5 +1,8 @@
postfix: postfix:
manage_master_config: True manage_master_config: True
master_config:
enable_submission: False
config: config:
smtpd_banner: $myhostname ESMTP $mail_name smtpd_banner: $myhostname ESMTP $mail_name
biff: 'no' biff: 'no'

9
postfix/files/master.cf
View File

@ -1,3 +1,4 @@
{% set master_config = salt['pillar.get']('postfix:master_config', {}) -%}
# #
# 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
@ -14,10 +15,11 @@ smtp inet n - - - - smtpd
#smtpd pass - - - - - smtpd #smtpd pass - - - - - smtpd
#dnsblog unix - - - - 0 dnsblog #dnsblog unix - - - - 0 dnsblog
#tlsproxy unix - - - - 0 tlsproxy #tlsproxy unix - - - - 0 tlsproxy
#submission inet n - - - - smtpd {% if master_config.get('enable_submission', False) %}
submission inet n - - - - smtpd
# -o syslog_name=postfix/submission # -o syslog_name=postfix/submission
# -o smtpd_tls_security_level=encrypt -o smtpd_tls_security_level=encrypt
# -o smtpd_sasl_auth_enable=yes -o smtpd_sasl_auth_enable=yes
# -o smtpd_reject_unlisted_recipient=no # -o smtpd_reject_unlisted_recipient=no
# -o smtpd_client_restrictions=$mua_client_restrictions # -o smtpd_client_restrictions=$mua_client_restrictions
# -o smtpd_helo_restrictions=$mua_helo_restrictions # -o smtpd_helo_restrictions=$mua_helo_restrictions
@ -25,6 +27,7 @@ smtp inet n - - - - smtpd
# -o smtpd_recipient_restrictions= # -o smtpd_recipient_restrictions=
# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject # -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
# -o milter_macro_daemon_name=ORIGINATING # -o milter_macro_daemon_name=ORIGINATING
{% endif %}
#smtps inet n - - - - smtpd #smtps inet n - - - - smtpd
# -o syslog_name=postfix/smtps # -o syslog_name=postfix/smtps
# -o smtpd_tls_wrappermode=yes # -o smtpd_tls_wrappermode=yes