diff --git a/tasks/lookup_tables.yml b/tasks/lookup_tables.yml index 8aec000..31f3198 100644 --- a/tasks/lookup_tables.yml +++ b/tasks/lookup_tables.yml @@ -16,7 +16,7 @@ src: sqlite_table.cf.j2 dest: /etc/postfix/{{ domain }}_sqlite_{{ item }}.cf 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: - user - alias @@ -25,35 +25,35 @@ - name: Template file user lookup table blockinfile: 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 }} {% else %}{{ item.user }} {{ item.mailbox }} {% 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" create: yes 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 - name: Template file alias lookup table blockinfile: block: | - {% for key in postfix_domain_config[domain]['aliases']|default([]) -%} + {% for key in postfix_mail_domains[domain]['aliases']|default([]) -%} {{ key.alias }} {{ key.dest }} {% 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" create: yes 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 - name: Template no-reply aliases file copy: 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 {% 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 diff --git a/tasks/main.yml b/tasks/main.yml index 0f97c32..09b8d4c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -95,7 +95,7 @@ - name: Configurar lookup tables include_tasks: lookup_tables.yml - loop: "{{ postfix_mail_domains }}" + loop: "{{ postfix_mail_domains.keys() }}" loop_control: loop_var: domain