Merge pull request #33 from EvaSDK/fix-password-leak

Do not leak passwords
This commit is contained in:
Forrest 2015-12-29 11:41:17 -08:00
commit 9bfa97d376

View File

@ -12,7 +12,7 @@ postfix:
- watch: - watch:
- pkg: postfix - pkg: postfix
{%- macro postmap_file(filename) %} {%- macro postmap_file(filename, mode=644) %}
{%- set file_path = '/etc/postfix/' ~ filename %} {%- set file_path = '/etc/postfix/' ~ filename %}
postmap_{{ filename }}: postmap_{{ filename }}:
file.managed: file.managed:
@ -20,7 +20,7 @@ postmap_{{ filename }}:
- source: salt://postfix/{{ filename }} - source: salt://postfix/{{ filename }}
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: {{ mode }}
- template: jinja - template: jinja
- require: - require:
- pkg: postfix - pkg: postfix
@ -58,7 +58,7 @@ run-newaliases:
# 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', '') %}
{{ postmap_file('sasl_passwd') }} {{ postmap_file('sasl_passwd', 600) }}
{% endif %} {% endif %}
# manage /etc/postfix/sender_canonical if data found in pillar # manage /etc/postfix/sender_canonical if data found in pillar