Linux-Help/formula-postfix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #23 from EvaSDK/master

Browse source 
Misc enhancements
This commit is contained in:
puneet kandhari 2015-08-22 10:10:06 -05:00
commit 307e1624b2
6 changed files with 107 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pillar.example
View file

@ -3,6 +3,14 @@ postfix:
master_config: master_config:
enable_submission: False enable_submission: False
postgrey:
enabled: True
location: inet:172.16.0.5:6379
policyd-spf:
enabled: True
time_limit: 7200s
config: config:
smtpd_banner: $myhostname ESMTP $mail_name smtpd_banner: $myhostname ESMTP $mail_name
biff: 'no' biff: 'no'

33
postfix/files/main.cf
View file

@ -1,9 +1,18 @@
{% from "postfix/map.jinja" import postfix with context %}
{% set config = salt['pillar.get']('postfix:config', {}) -%} {% set config = salt['pillar.get']('postfix:config', {}) -%}
{% set processed_parameters = ['aliases', 'virtual'] -%} {% set processed_parameters = ['aliases', 'virtual'] -%}
{% macro set_parameter(parameter, default=None) -%} {% macro set_parameter(parameter, default=None) -%}
{% set value = config.get(parameter, default) -%} {% set value = config.get(parameter, default) -%}
{% if value is not none -%} {% if value is not none -%}
{%- if value is number or value is string %}
{{ parameter }} = {{ value }} {{ parameter }} = {{ value }}
{%- elif value is iterable %}
{{ parameter }} =
{%- for v in value %}
{{ v }},
{%- endfor %}
{%- endif %}
{%- do processed_parameters.append(parameter) -%} {%- do processed_parameters.append(parameter) -%}
{% endif -%} {% endif -%}
{% endmacro -%} {% endmacro -%}
@ -39,18 +48,30 @@
# information on enabling SSL in the smtp client. # information on enabling SSL in the smtp client.
{{ set_parameter('myhostname', grains['fqdn']) }} {{ set_parameter('myhostname', grains['fqdn']) }}
{{ set_parameter('alias_maps', 'hash:/etc/aliases') }} {{ set_parameter('alias_maps', 'hash:' ~ postfix.aliases) }}
{{ set_parameter('alias_database', 'hash:/etc/aliases') }} {{ set_parameter('alias_database', 'hash:' ~ postfix.aliases) }}
{{ set_parameter('mydestination', grains['fqdn'] + ', localhost, localhost.localdomain, ' + grains['domain'] ) }} {{ set_parameter('mydestination', [grains['fqdn'], 'localhost', 'localhost.localdomain', grains['domain']]) }}
{{ set_parameter('relayhost', '') }} {{ set_parameter('relayhost', '') }}
{{ set_parameter('mynetworks', '127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128') }} {{ set_parameter('mynetworks', ['127.0.0.0/8', '[::ffff:127.0.0.0]/104', '[::1]/128']) }}
{{ set_parameter('mailbox_size_limit', '0') }} {{ set_parameter('mailbox_size_limit', '0') }}
{{ set_parameter('recipient_delimiter', '+') }} {{ set_parameter('recipient_delimiter', '+') }}
{{ set_parameter('inet_interfaces', 'all') }} {{ set_parameter('inet_interfaces', 'all') }}
{{ set_parameter('message_size_limit', '41943040') }} {{ set_parameter('message_size_limit', '41943040') }}
{{ set_parameter('policyd-spf_time_limit', '3600s') }}
{{ set_parameter('smtpd_relay_restrictions', 'permit_mynetworks permit_sasl_authenticated defer_unauth_destination check_policy_service unix:private/policyd-spf') }}
{% set relay_restrictions = ['permit_mynetworks', 'permit_sasl_authenticated', 'defer_unauth_destination'] %}
{% set policyd_spf = salt['pillar.get']('postfix:policyd-spf', {}) %}
{% if policyd_spf.get('enabled', False) %}
{% set relay_restrictions = relay_restrictions + ['check_policy_server unix:private/policyd-spf'] %}
policy-spf_time_limit = {{ policyd_spf.get('time_limit', '3600s') }}
{% endif %}
{{ set_parameter('smtpd_relay_restrictions', relay_restrictions) }}
{% set recipient_restrictions = ['permit_mynetworks', 'permit_sasl_authenticated', 'reject_unauth_destination'] %}
{% set postgrey_config = salt['pillar.get']('postfix:postgrey', {}) %}
{% if postgrey_config.get('enabled', False) %}
{% set recipient_restrictions = recipient_restrictions + ['check_policy_service ' ~ postgrey_config.get('location', 'inet:127.0.0.1:10030')] %}
{% endif %}
{{ set_parameter('smtpd_recipient_restrictions', recipient_restrictions) }}
{% if 'virtual' in pillar.get('postfix','') %} {% if 'virtual' in pillar.get('postfix','') %}
virtual_alias_maps = hash:/etc/postfix/virtual virtual_alias_maps = hash:/etc/postfix/virtual

94
postfix/files/master.cf
View file

@ -8,15 +8,15 @@
# #
# ========================================================================== # ==========================================================================
# service type private unpriv chroot wakeup maxproc command + args # service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100) # (yes) (yes) (no) (never) (100)
# ========================================================================== # ==========================================================================
smtp inet n - - - - smtpd smtp inet n - n - - smtpd
#smtp inet n - - - 1 postscreen #smtp inet n - n - 1 postscreen
#smtpd pass - - - - - smtpd #smtpd pass - - n - - smtpd
#dnsblog unix - - - - 0 dnsblog #dnsblog unix - - n - 0 dnsblog
#tlsproxy unix - - - - 0 tlsproxy #tlsproxy unix - - n - 0 tlsproxy
{% if master_config.get('enable_submission', False) %} {% if master_config.get('enable_submission', False) %}
submission inet n - - - - smtpd submission inet n - 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
@ -28,7 +28,7 @@ submission inet n - - - - smtpd
# -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 %} {% endif %}
#smtps inet n - - - - smtpd #smtps inet n - n - - smtpd
# -o syslog_name=postfix/smtps # -o syslog_name=postfix/smtps
# -o smtpd_tls_wrappermode=yes # -o smtpd_tls_wrappermode=yes
# -o smtpd_sasl_auth_enable=yes # -o smtpd_sasl_auth_enable=yes
@ -39,32 +39,32 @@ submission 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
#628 inet n - - - - qmqpd #628 inet n - n - - qmqpd
pickup unix n - - 60 1 pickup pickup unix n - n 60 1 pickup
cleanup unix n - - - 0 cleanup cleanup unix n - n - 0 cleanup
qmgr unix n - n 300 1 qmgr qmgr unix n - n 300 1 qmgr
#qmgr unix n - n 300 1 oqmgr #qmgr unix n - n 300 1 oqmgr
tlsmgr unix - - - 1000? 1 tlsmgr tlsmgr unix - - n 1000? 1 tlsmgr
rewrite unix - - - - - trivial-rewrite rewrite unix - - n - - trivial-rewrite
bounce unix - - - - 0 bounce bounce unix - - n - 0 bounce
defer unix - - - - 0 bounce defer unix - - n - 0 bounce
trace unix - - - - 0 bounce trace unix - - n - 0 bounce
verify unix - - - - 1 verify verify unix - - n - 1 verify
flush unix n - - 1000? 0 flush flush unix n - n 1000? 0 flush
proxymap unix - - n - - proxymap proxymap unix - - n - - proxymap
proxywrite unix - - n - 1 proxymap proxywrite unix - - n - 1 proxymap
smtp unix - - - - - smtp smtp unix - - n - - smtp
relay unix - - - - - smtp relay unix - - n - - smtp
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
showq unix n - - - - showq showq unix n - n - - showq
error unix - - - - - error error unix - - n - - error
retry unix - - - - - error retry unix - - n - - error
discard unix - - - - - discard discard unix - - n - - discard
local unix - n n - - local local unix - n n - - local
virtual unix - n n - - virtual virtual unix - n n - - virtual
lmtp unix - - - - - lmtp lmtp unix - - n - - lmtp
anvil unix - - - - 1 anvil anvil unix - - n - 1 anvil
scache unix - - - - 1 scache scache unix - - n - 1 scache
# #
# ==================================================================== # ====================================================================
# Interfaces to non-Postfix software. Be sure to examine the manual # Interfaces to non-Postfix software. Be sure to examine the manual
@ -78,8 +78,8 @@ scache unix - - - - 1 scache
# maildrop. See the Postfix MAILDROP_README file for details. # maildrop. See the Postfix MAILDROP_README file for details.
# Also specify in main.cf: maildrop_destination_recipient_limit=1 # Also specify in main.cf: maildrop_destination_recipient_limit=1
# #
maildrop unix - n n - - pipe #maildrop unix - n n - - pipe
flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} # flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}
# #
# ==================================================================== # ====================================================================
# #
@ -101,6 +101,7 @@ maildrop unix - n n - - pipe
# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} # user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
# #
# ==================================================================== # ====================================================================
#
# Old example of delivery via Cyrus. # Old example of delivery via Cyrus.
# #
#old-cyrus unix - n n - - pipe #old-cyrus unix - n n - - pipe
@ -110,20 +111,27 @@ maildrop unix - n n - - pipe
# #
# See the Postfix UUCP_README file for configuration details. # See the Postfix UUCP_README file for configuration details.
# #
uucp unix - n n - - pipe #uucp unix - n n - - pipe
flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) # flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
#
# ====================================================================
# #
# Other external delivery methods. # Other external delivery methods.
# #
ifmail unix - n n - - pipe #ifmail unix - n n - - pipe
flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) # flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
bsmtp unix - n n - - pipe #
flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -t$nexthop -f$sender $recipient #bsmtp unix - n n - - pipe
scalemail-backend unix - n n - 2 pipe # flags=Fq. user=bsmtp argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension} #
mailman unix - n n - - pipe #scalemail-backend unix - n n - 2 pipe
flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py # flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store
${nexthop} ${user} # ${nexthop} ${user} ${extension}
#
policyd-spf unix - n n - 0 spawn #mailman unix - n n - - pipe
user=nobody argv=/usr/bin/policyd-spf /etc/postfix-policyd-spf-python/policyd-spf.conf # flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
# ${nexthop} ${user}
{% if salt['pillar.get']('postfix:policyd-spf:enabled', False) %}
policy-spf unix - n n - - spawn
user=nobody argv=/usr/bin/policyd-spf
{%- endif %}

11
postfix/init.sls
View file

@ -1,15 +1,10 @@
{% from "postfix/map.jinja" import postfix with context %} {% from "postfix/map.jinja" import postfix with context %}
postfix: postfix:
{% if postfix.packages is defined %}
pkg.installed: pkg.installed:
- names: - name: {{ postfix.package }}
{% for name in postfix.packages %}
- {{ name }}
{% endfor %}
- watch_in: - watch_in:
- service: postfix - service: postfix
{% endif %}
service.running: service.running:
- enable: True - enable: True
- require: - require:
@ -19,7 +14,7 @@ postfix:
# manage /etc/aliases if data found in pillar # manage /etc/aliases if data found in pillar
{% if 'aliases' in pillar.get('postfix', '') %} {% if 'aliases' in pillar.get('postfix', '') %}
/etc/aliases: {{ postfix.aliases_file }}:
file.managed: file.managed:
- source: salt://postfix/aliases - source: salt://postfix/aliases
- user: root - user: root
@ -34,7 +29,7 @@ run-newaliases:
- name: newaliases - name: newaliases
- cwd: / - cwd: /
- watch: - watch:
- file: /etc/aliases - file: {{ postfix.aliases_file }}
{% endif %} {% endif %}
# manage /etc/postfix/virtual if data found in pillar # manage /etc/postfix/virtual if data found in pillar

18
postfix/map.jinja
View file

@ -1,22 +1,30 @@
{% set postfix = salt['grains.filter_by']({ {% set postfix = salt['grains.filter_by']({
'Debian': { 'Debian': {
'packages': ['postfix', 'postfix-policyd-spf-python'], 'package': 'postfix',
'policyd_spf_pkg': 'postfix-policyd-spf-python',
'postgrey_pkg': 'postgrey', 'postgrey_pkg': 'postgrey',
'service': 'postfix', 'service': 'postfix',
'aliases': '/etc/aliases',
}, },
'Gentoo': { 'Gentoo': {
'packages': ['mail-mta/postfix'], 'package': 'mail-mta/postfix',
'postgrey_pkg': 'postgrey', 'policyd_spf_pkg': 'mail-filter/pypolicyd-spf',
'postgrey_pkg': 'mail-filter/postgrey',
'service': 'postfix', 'service': 'postfix',
'aliases': '/etc/mail/aliases',
}, },
'RedHat': { 'RedHat': {
'packages': ['postfix'], 'package': 'postfix',
'policyd_spf_pkg': 'pypolicyd-spf',
'postgrey_pkg': 'postgrey', 'postgrey_pkg': 'postgrey',
'service': 'postfix', 'service': 'postfix',
'aliases': '/etc/aliases',
}, },
'Arch' : { 'Arch' : {
'packages': ['postfix'], 'package': 'postfix',
'policyd_spf_pkg': 'python-postfix-policyd-spf',
'postgrey_pkg': 'postgrey', 'postgrey_pkg': 'postgrey',
'service': 'postfix', 'service': 'postfix',
'aliases': '/etc/aliases',
}, },
}, merge=salt['pillar.get']('postfix:lookup')) %} }, merge=salt['pillar.get']('postfix:lookup')) %}

5
postfix/policyd-spf.sls Normal file
View file

@ -0,0 +1,5 @@
{% from "postfix/map.jinja" import postfix with context %}
policyd_spf:
pkg.installed:
- name: {{ postfix.policyd_spf_pkg }}