Allow alias_database file type to be respected for running newaliases
See github issue #50.
This commit is contained in:
parent
b2fc0f1c0b
commit
961c1e10c4
@ -17,8 +17,19 @@ 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', '') %}
|
||||||
{{ postfix.aliases_file }}:
|
{%- set need_newaliases = False %}
|
||||||
|
{%- set file_path = postfix.aliases_file %}
|
||||||
|
{%- if ':' in file_path %}
|
||||||
|
{%- set file_type, file_path = postfix.aliases_file.split(':') %}
|
||||||
|
{%- else %}
|
||||||
|
{%- set file_type = default_database_type %}
|
||||||
|
{%- endif %}
|
||||||
|
{%- if file_type in ("btree", "cdb", "dbm", "hash", "sdbm") %}
|
||||||
|
{%- set need_newaliases = True %}
|
||||||
|
{%- endif %}
|
||||||
|
postfix_alias_database:
|
||||||
file.managed:
|
file.managed:
|
||||||
|
- name: {{ file_path }}
|
||||||
- source: salt://postfix/aliases
|
- source: salt://postfix/aliases
|
||||||
- user: root
|
- user: root
|
||||||
- group: root
|
- group: root
|
||||||
@ -26,13 +37,13 @@ postfix:
|
|||||||
- template: jinja
|
- template: jinja
|
||||||
- require:
|
- require:
|
||||||
- pkg: postfix
|
- pkg: postfix
|
||||||
|
{%- if need_newaliases %}
|
||||||
run-newaliases:
|
|
||||||
cmd.wait:
|
cmd.wait:
|
||||||
- name: newaliases
|
- name: newaliases
|
||||||
- cwd: /
|
- cwd: /
|
||||||
- watch:
|
- watch:
|
||||||
- file: {{ postfix.aliases_file }}
|
- file: {{ file_path }}
|
||||||
|
{%- endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
# manage various mappings
|
# manage various mappings
|
||||||
|
Loading…
Reference in New Issue
Block a user