Merge pull request #30 from EvaSDK/29-postmap-macro

#29 postmap macro
This commit is contained in:
Forrest 2015-11-12 17:00:21 -08:00
commit 83f997bce7
2 changed files with 25 additions and 49 deletions

View File

@ -41,9 +41,9 @@
{%- if config.get('smtpd_sasl_auth_enable', 'yes') == 'yes' %} {%- if config.get('smtpd_sasl_auth_enable', 'yes') == 'yes' %}
# SASL parameters (http://www.postfix.org/SASL_README.html) # SASL parameters (http://www.postfix.org/SASL_README.html)
{%- do relay_restrictions.append('permit_sasl_authenticated') -%} {%- do relay_restrictions.append('permit_sasl_authenticated') %}
{%- do recipient_restrictions.append('permit_sasl_authenticated') -%} {%- do recipient_restrictions.append('permit_sasl_authenticated') %}
{{ set_parameter('smtpd_sasl_auth_enable') }} {{ set_parameter('smtpd_sasl_auth_enable', 'yes') }}
{{ set_parameter('smtpd_sasl_path', 'smtpd') }} {{ set_parameter('smtpd_sasl_path', 'smtpd') }}
{{ set_parameter('smtpd_sasl_type', 'cyrus') }} {{ set_parameter('smtpd_sasl_type', 'cyrus') }}
{{ set_parameter('smtpd_sasl_security_options', ['noanonymous', 'noplaintext']) }} {{ set_parameter('smtpd_sasl_security_options', ['noanonymous', 'noplaintext']) }}

View File

@ -12,6 +12,25 @@ postfix:
- watch: - watch:
- pkg: postfix - pkg: postfix
{%- macro postmap_file(filename) %}
{%- set file_path = '/etc/postfix/' ~ filename %}
postmap_{{ filename }}:
file.managed:
- name: {{ file_path }}
- source: salt://postfix/{{ filename }}
- user: root
- group: root
- mode: 0644
- template: jinja
- require:
- pkg: postfix
cmd.wait:
- name: /usr/sbin/postmap {{ file_path }}
- cwd: /
- watch:
- file: {{ file_path }}
{%- endmacro %}
# 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', '') %}
{{ postfix.aliases_file }}: {{ postfix.aliases_file }}:
@ -34,58 +53,15 @@ run-newaliases:
# manage /etc/postfix/virtual if data found in pillar # manage /etc/postfix/virtual if data found in pillar
{% if 'virtual' in pillar.get('postfix', '') %} {% if 'virtual' in pillar.get('postfix', '') %}
/etc/postfix/virtual: {{ postmap_file('virtual') }}
file.managed:
- source: salt://postfix/virtual
- user: root
- group: root
- mode: 644
- template: jinja
- require:
- pkg: postfix
run-postmap:
cmd.wait:
- name: /usr/sbin/postmap /etc/postfix/virtual
- cwd: /
- watch:
- file: /etc/postfix/virtual
{% endif %} {% endif %}
# manage /etc/postfix/sasl_passwd if data found in pillar # manage /etc/postfix/sasl_passwd if data found in pillar
{% if 'sasl_passwd' in pillar.get('postfix', '') %} {% if 'sasl_passwd' in pillar.get('postfix', '') %}
/etc/postfix/sasl_passwd: {{ postmap_file('sasl_passwd') }}
file.managed:
- source: salt://postfix/sasl_passwd
- user: root
- group: root
- mode: 644
- template: jinja
- require:
- pkg: postfix
cmd.wait:
- name: /usr/sbin/postmap /etc/postfix/sasl_passwd
- cwd: /
- watch:
- file: /etc/postfix/sasl_passwd
{% endif %} {% endif %}
# manage /etc/postfix/sender_canonical if data found in pillar # manage /etc/postfix/sender_canonical if data found in pillar
{% if 'sender_canonical' in pillar.get('postfix', '') %} {% if 'sender_canonical' in pillar.get('postfix', '') %}
/etc/postfix/sender_canonical: {{ postmap_file('sender_canonical') }}
file.managed:
- source: salt://postfix/sender_canonical
- user: root
- group: root
- mode: 644
- template: jinja
- require:
- pkg: postfix
cmd.wait:
- name: /usr/sbin/postmap /etc/postfix/sender_canonical
- cwd: /
- watch:
- file: /etc/postfix/sender_canonical
{% endif %} {% endif %}