e4b507b0b5
As promised in PR #75, here's a further (and hopefully final) iteration of the master.cf service handling: - Bring dovecot and policyd-spf configuration in line with the extras_services item added in PR #75 - Remove policyd-spf configuration again from services.jinja, handle this in master.cf instead, where it was before - Allow for completely custom services to be added via a pillar definition in postfix:master_config:services - Fix legacy dovecot argv example in pillar.example: The example showed the extra_args being defined as part of the argv parameter, something that would clash with the actual code and result in a duplicate '-d ${recipient}' definition in the config.
247 lines
12 KiB
CFEngine3
247 lines
12 KiB
CFEngine3
{%- from "postfix/map.jinja" import postfix with context -%}
|
|
{%- set master_config = salt['pillar.get']('postfix:master_config', {}) -%}
|
|
{%- from "postfix/services.jinja" import postfix_master_services_defaults,
|
|
postfix_master_services_order -%}
|
|
|
|
{#-
|
|
# Handle the case that the pillar data does not provide any service
|
|
# configuration but submission parameters are provided in the pillar.
|
|
# This is important for backwards compatibility with sites that are using
|
|
# the previous enable_submission pillar settings.
|
|
-#}
|
|
{%- set additional_services = {} -%}
|
|
{%- if master_config.get('enable_submission', False) and not salt[
|
|
'pillar.get']('postfix:master_config:services:submission', False) -%}
|
|
{%- do additional_services.update({'submission': {'chroot': False,
|
|
'command': 'smtpd',
|
|
'enable': True,
|
|
'type': 'inet',
|
|
'args': [],
|
|
'private': False}}) -%}
|
|
{%- if master_config.get('submission', False) -%}
|
|
{%- for parameter, value in master_config.get('submission', {}).items() -%}
|
|
{%- if value is number or value is string -%}
|
|
{%- do additional_services['submission']['args'].append('-o %s=%s' % (
|
|
parameter, value)) -%}
|
|
{%- elif value is iterable -%}
|
|
{%- do additional_services['submission']['args'].append('-o %s=%s' % (
|
|
parameter, ','.join(value))) -%}
|
|
{%- endif -%}
|
|
{%- endfor -%}
|
|
{%- else -%}
|
|
{%- do additional_services[
|
|
'submission']['args'].extend(['# -o syslog_name=postfix/submission',
|
|
'-o smtpd_tls_security_level=encrypt',
|
|
'-o smtpd_sasl_auth_enable=yes',
|
|
'# -o smtpd_reject_unlisted_recipient=no',
|
|
'# -o smtpd_client_restrictions=$mua_client_restrictions',
|
|
'# -o smtpd_helo_restrictions=$mua_helo_restrictions',
|
|
'# -o smtpd_sender_restrictions=$mua_sender_restrictions',
|
|
'# -o smtpd_recipient_restrictions=',
|
|
'# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject',
|
|
'# -o milter_macro_daemon_name=ORIGINATING'
|
|
]) -%}
|
|
{%- endif -%}
|
|
{%- endif -%}
|
|
|
|
{#- Format the postfix service parameters correctly -#}
|
|
{%- macro service_param(service, service_name, parameter_name, default='-') -%}
|
|
{#- Fetch the value from the passed service dictionary or fall back to the
|
|
# service defaults by chaining .get() commands. #}
|
|
{%- set value = service.get(parameter_name,
|
|
postfix_master_services_defaults[service_name].get(
|
|
parameter_name, default)) -%}
|
|
{%- if value is sameas false -%}
|
|
n
|
|
{%- elif value is sameas true -%}
|
|
y
|
|
{%- elif value is number or value is string -%}
|
|
{{ value }}
|
|
{%- else -%}
|
|
-
|
|
{%- endif -%}
|
|
{%- endmacro -%}
|
|
|
|
#
|
|
# This file is managed by salt.
|
|
# Modify the salt pillar in the postfix formula that generates this file instead.
|
|
#
|
|
# 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).
|
|
#
|
|
# Do not forget to execute "postfix reload" after editing this file.
|
|
#
|
|
# ==========================================================================
|
|
# service type private unpriv chroot wakeup maxproc command + args
|
|
# (yes) (yes) (no) (never) (100)
|
|
# ==========================================================================
|
|
{%- for service_name in postfix_master_services_order %}
|
|
{#- Try to get the service configuration from the pillar if present.
|
|
# Next try if the service has been dynamically configured and is present in
|
|
# the additional_services dictionary.
|
|
# If absent, fall back to the defaults provided in services.jinja -#}
|
|
{%- set service = salt['pillar.get']('postfix:master_config:services:%s' % (
|
|
service_name,),
|
|
additional_services.get(service_name,
|
|
postfix_master_services_defaults[service_name])) -%}
|
|
{%- if service.get('enable', True) -%}
|
|
{%- set comment = '' -%}
|
|
{%- else -%}
|
|
{%- set comment = '#' -%}
|
|
{%- endif %}
|
|
{{ "%s%-9s %-5s %-7s %-7s %-7s %-7s %-7s %s" | format(comment,
|
|
service_param(service, service_name, 'service', service_name),
|
|
service_param(service, service_name, 'type'),
|
|
service_param(service, service_name, 'private'),
|
|
service_param(service, service_name, 'unpriv'),
|
|
service_param(service, service_name, 'chroot'),
|
|
service_param(service, service_name, 'wakeup'),
|
|
service_param(service, service_name, 'maxproc'),
|
|
service_param(service, service_name, 'command', service_name)) -}}
|
|
{%- if service.args is not none -%}
|
|
{%- for option in service.get('args', postfix_master_services_defaults[
|
|
service_name].get('args', [])) -%}
|
|
{%- if option.startswith('#') %}
|
|
{{ option }}
|
|
{%- else %}
|
|
{{ comment }} {{ option }}
|
|
{%- endif %}
|
|
{%- endfor %}
|
|
{%- endif %}
|
|
{%- endfor %}
|
|
#
|
|
{%- set handled_extra_services = [] -%}
|
|
{%- macro extra_service(service_name, wrap=False) -%}
|
|
{%- do handled_extra_services.append(service_name) -%}
|
|
{%- set service = salt['pillar.get']('postfix:master_config:services:%s' % (
|
|
service_name,),
|
|
postfix_master_services_defaults[service_name]) -%}
|
|
{%- if service.get('enable', True) -%}
|
|
{%- set comment = '' -%}
|
|
{%- else -%}
|
|
{%- set comment = '#' -%}
|
|
{%- endif -%}
|
|
{{ "%s%-9s %-5s %-7s %-7s %-7s %-7s %-7s %s" | format(comment,
|
|
service_param(service, service_name, 'service', service_name),
|
|
service_param(service, service_name, 'type'),
|
|
service_param(service, service_name, 'private'),
|
|
service_param(service, service_name, 'unpriv'),
|
|
service_param(service, service_name, 'chroot'),
|
|
service_param(service, service_name, 'wakeup'),
|
|
service_param(service, service_name, 'maxproc'),
|
|
service_param(service, service_name, 'command', service_name)) }}
|
|
{%- if 'flags' in service or 'flags' in postfix_master_services_defaults[service_name] -%}
|
|
{%- set parameter_str = "%s flags=%s user=%s argv=%s %s" | format(comment,
|
|
service_param(service, service_name, 'flags'),
|
|
service_param(service, service_name, 'user'),
|
|
service_param(service, service_name, 'argv'),
|
|
service_param(service, service_name, 'extras', '')) -%}
|
|
{%- else -%}
|
|
{%- set parameter_str = "%s user=%s argv=%s %s" | format(comment,
|
|
service_param(service, service_name, 'user'),
|
|
service_param(service, service_name, 'argv'),
|
|
service_param(service, service_name, 'extras', '')) -%}
|
|
{%- endif -%}
|
|
{%- if wrap %}
|
|
{{ parameter_str | wordwrap(width=wrap, break_long_words=False, wrapstring='\n%s ' | format(comment)) }}
|
|
{%- else %}
|
|
{{ parameter_str }}
|
|
{%- endif -%}
|
|
{%- endmacro -%}
|
|
|
|
{#- Handle legacy configuration of services for backwards compatibility
|
|
by extending the services dictionary accordingly #}
|
|
{%- if salt['pillar.get']('postfix:policyd-spf:enabled', False) %}
|
|
{%- do postfix_master_services_defaults.update({'policy-spf': {
|
|
'command': 'spawn',
|
|
'chroot': False,
|
|
'enable': True,
|
|
'type': 'unix',
|
|
'unpriv': False,
|
|
'user': 'nobody',
|
|
'argv': '%s/bin/policyd-spf' | format(postfix.xbin_prefix)}}) %}
|
|
{%- endif %}
|
|
{%- if master_config.get('enable_dovecot', False) -%}
|
|
{%- set dovecot = master_config.get('dovecot', {} )%}
|
|
{%- do postfix_master_services_defaults.update({'dovecot': {
|
|
'command': 'pipe',
|
|
'chroot': False,
|
|
'enable': True,
|
|
'extras': '-d ${recipient}',
|
|
'flags': dovecot.get('flags', 'DRhu'),
|
|
'type': 'unix',
|
|
'unpriv': False,
|
|
'user': '%s:%s' | format(dovecot.get('user', 'vmail'), dovecot.get('group', 'vmail')),
|
|
'argv': dovecot.get('argv', postfix.dovecot_deliver) }}) %}
|
|
{%- endif %}
|
|
# ====================================================================
|
|
# Interfaces to non-Postfix software. Be sure to examine the manual
|
|
# pages of the non-Postfix software to find out what options it wants.
|
|
#
|
|
# Many of the following services use the Postfix pipe(8) delivery
|
|
# agent. See the pipe(8) man page for information about ${recipient}
|
|
# and other message envelope options.
|
|
# ====================================================================
|
|
#
|
|
# maildrop. See the Postfix MAILDROP_README file for details.
|
|
# Also specify in main.cf: maildrop_destination_recipient_limit=1
|
|
#
|
|
{{ extra_service('maildrop') }}
|
|
#
|
|
# ====================================================================
|
|
#
|
|
# Recent Cyrus versions can use the existing "lmtp" master.cf entry.
|
|
#
|
|
# Specify in cyrus.conf:
|
|
# lmtp cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4
|
|
#
|
|
# Specify in main.cf one or more of the following:
|
|
# mailbox_transport = lmtp:inet:localhost
|
|
# virtual_transport = lmtp:inet:localhost
|
|
#
|
|
# ====================================================================
|
|
#
|
|
# Cyrus 2.1.5 (Amos Gouaux)
|
|
# Also specify in main.cf: cyrus_destination_recipient_limit=1
|
|
#
|
|
{{ extra_service('cyrus') }}
|
|
#
|
|
# ====================================================================
|
|
#
|
|
# Old example of delivery via Cyrus.
|
|
#
|
|
{{ extra_service('old-cyrus') }}
|
|
#
|
|
# ====================================================================
|
|
#
|
|
# See the Postfix UUCP_README file for configuration details.
|
|
#
|
|
{{ extra_service('uucp') }}
|
|
#
|
|
# ====================================================================
|
|
#
|
|
# Other external delivery methods.
|
|
#
|
|
{{ extra_service('ifmail') }}
|
|
#
|
|
{{ extra_service('bsmtp') }}
|
|
#
|
|
{{ extra_service('scalemail-backend', 79) }}
|
|
#
|
|
{{ extra_service('mailman', 79) }}
|
|
{#- Handle custom services configured as pillars by extending the services
|
|
dictionary for all defined services that have not been otherwise be
|
|
handled yet. -#}
|
|
{%- for service in salt['pillar.get']('postfix:master_config:services', []) if not service in handled_extra_services -%}
|
|
{%- do postfix_master_services_defaults.update({service: salt['pillar.get']('postfix:master_config:services:%s' % (service,))}) -%}
|
|
{%- endfor -%}
|
|
{%- for service in postfix_master_services_defaults if not service in handled_extra_services and not service in postfix_master_services_order %}
|
|
#
|
|
{%- if postfix_master_services_defaults[service].get('wrap', False) %}
|
|
{{ extra_service(service, 78) }}
|
|
{%- else %}
|
|
{{ extra_service(service) }}
|
|
{%- endif %}
|
|
{%- endfor %}
|