simplificando config

This commit is contained in:
Mauro Torrez 2019-08-25 19:22:03 -03:00
parent 8cd5818318
commit e130f67b5f
2 changed files with 10 additions and 10 deletions

View File

@ -16,7 +16,7 @@
src: sqlite_table.cf.j2 src: sqlite_table.cf.j2
dest: /etc/postfix/{{ domain }}_sqlite_{{ item }}.cf dest: /etc/postfix/{{ domain }}_sqlite_{{ item }}.cf
when: when:
- postfix_domain_config[domain][item+'_lookup'].provider|default(postfix_lookup_provider) == 'sqlite' - postfix_mail_domains[domain][item+'_lookup'].provider|default(postfix_lookup_provider) == 'sqlite'
loop: loop:
- user - user
- alias - alias
@ -25,35 +25,35 @@
- name: Template file user lookup table - name: Template file user lookup table
blockinfile: blockinfile:
block: | block: |
{% for item in postfix_domain_config[domain]['users']|default([]) -%} {% for item in postfix_mail_domains[domain]['users']|default([]) -%}
{% if item is string %}{{ item }} /nomailbox/{{ item }} {% if item is string %}{{ item }} /nomailbox/{{ item }}
{% else %}{{ item.user }} {{ item.mailbox }} {% else %}{{ item.user }} {{ item.mailbox }}
{% endif %}{% endfor %} {% endif %}{% endfor %}
dest: "{{ postfix_domain_config[domain].user_lookup.file|default(vmail_home+'/'+domain+'_users') }}" dest: "{{ postfix_mail_domains[domain].user_lookup.file|default(vmail_home+'/'+domain+'_users') }}"
marker: "# {mark} ANSIBLE-MANAGED USERS" marker: "# {mark} ANSIBLE-MANAGED USERS"
create: yes create: yes
when: when:
- postfix_domain_config[domain].user_lookup.provider|default(postfix_lookup_provider) == 'file' - postfix_mail_domains[domain].user_lookup.provider|default(postfix_lookup_provider) == 'file'
notify: postmap hash users notify: postmap hash users
- name: Template file alias lookup table - name: Template file alias lookup table
blockinfile: blockinfile:
block: | block: |
{% for key in postfix_domain_config[domain]['aliases']|default([]) -%} {% for key in postfix_mail_domains[domain]['aliases']|default([]) -%}
{{ key.alias }} {{ key.dest }} {{ key.alias }} {{ key.dest }}
{% endfor %} {% endfor %}
dest: "{{ postfix_domain_config[domain].user_lookup.file|default(vmail_home+'/'+domain+'_aliases') }}" dest: "{{ postfix_mail_domains[domain].user_lookup.file|default(vmail_home+'/'+domain+'_aliases') }}"
marker: "# {mark} ANSIBLE-MANAGED ALIASES" marker: "# {mark} ANSIBLE-MANAGED ALIASES"
create: yes create: yes
when: when:
- postfix_domain_config[domain].alias_lookup.provider|default(postfix_lookup_provider) == 'file' - postfix_mail_domains[domain].alias_lookup.provider|default(postfix_lookup_provider) == 'file'
notify: postmap hash aliases notify: postmap hash aliases
- name: Template no-reply aliases file - name: Template no-reply aliases file
copy: copy:
content: | content: |
{% for address in postfix_domain_config[domain].noreply_aliases|default(['noreply']) %} {% for address in postfix_mail_domains[domain].noreply_aliases|default(['noreply']) %}
{{ address }}@domain _dev_null {{ address }}@domain _dev_null
{% endfor %} {% endfor %}
dest: "{{ postfix_domain_config[domain].noreply_file|default(vmail_home+'/'+domain+'_noreply') }}" dest: "{{ postfix_mail_domains[domain].noreply_file|default(vmail_home+'/'+domain+'_noreply') }}"
notify: postmap no reply aliases notify: postmap no reply aliases

View File

@ -95,7 +95,7 @@
- name: Configurar lookup tables - name: Configurar lookup tables
include_tasks: lookup_tables.yml include_tasks: lookup_tables.yml
loop: "{{ postfix_mail_domains }}" loop: "{{ postfix_mail_domains.keys() }}"
loop_control: loop_control:
loop_var: domain loop_var: domain