Split up email address information in `mail_virtual_users`

Use the changed `mail_virtual_users` structure to ensure directories and
sieve rules are created for each defined account.

roles/mailserver/tasks/dovecot.yml

@@ -19,8 +19,8 @@
   with_items: mail_virtual_domains
 
 - name: Ensure mail directories are in place
-  file: state=directory path=/decrypted/{{ item.name }}/{{ item.primary_user }} owner=vmail group=dovecot
-  with_items: mail_virtual_domains
+  file: state=directory path=/decrypted/{{ item.domain }}/{{ item.account }} owner=vmail group=dovecot
+  with_items: mail_virtual_users
 
 - name: Copy dovecot.conf into place
   copy: src=etc_dovecot_dovecot.conf dest=/etc/dovecot/dovecot.conf

roles/mailserver/tasks/dspam.yml

@@ -29,7 +29,7 @@
     - 90-plugin.conf
   notify: restart dovecot
 
-- name: Put sieve rules into each primary user directory
-  copy: src=dot_dovecot.sieve dest=/decrypted/{{ item.name }}/{{ item.primary_user }}/.dovecot.sieve owner=vmail group=dovecot
-  with_items: mail_virtual_domains
+- name: Put sieve rules into each user directory
+  copy: src=dot_dovecot.sieve dest=/decrypted/{{ item.domain }}/{{ item.account }}/.dovecot.sieve owner=vmail group=dovecot
+  with_items: mail_virtual_users
   notify: restart dovecot

roles/mailserver/templates/mailserver.sql.j2

@@ -36,7 +36,11 @@ INSERT INTO {{ mail_mysql_database }}.`virtual_domains` (`id`, `name`)
 
 {% for virtual_user in mail_virtual_users %}
 INSERT INTO {{ mail_mysql_database }}.`virtual_users`  (`domain_id`, `password` , `email`)
-	VALUES ('{{ virtual_user.domain_pk_id }}', '{{ virtual_user.password_hash }}', '{{ virtual_user.address }}');
+	VALUES (
+		'{{ virtual_user.domain_pk_id }}',
+		'{{ virtual_user.password_hash }}',
+		'{{ virtual_user.account }}@{{ virtual_user.domain }}'
+	);
 {% endfor %}
 
 {% if mail_virtual_aliases is defined %}

vars/testing.yml

@@ -23,9 +23,9 @@ mail_mysql_password: testPassword
 mail_virtual_domains:
   - name: "{{ domain }}"
     pk_id: 1
-    primary_user: "{{ main_user_name }}"
 mail_virtual_users:
-  - address: "{{ main_user_name }}@{{ domain }}"
+  - account: "{{ main_user_name }}"
+    domain: "{{ domain }}"
     password_hash: "$6$IYJfaF3jvmbAzlSe$1HBkbIdrOTWA31WYon7VSE2xAcFzYSZuVb8d3I0NDWzPxXBaqkHqKs4rLeNO9CVQEKv7wA15QctCyXbdRqFDy." #foo
     domain_pk_id: 1
 mail_virtual_aliases:

vars/user.yml

@@ -26,10 +26,12 @@ mail_virtual_domains:
 #    pk_id: 2
 #    primary_user: TODO
 mail_virtual_users:
-  - address: "{{ main_user_name }}@{{ domain }}"
+  - account: "{{ main_user_name }}"
+    domain: "{{ domain }}"
     password_hash: TODO
     domain_pk_id: 1
-#  - address: "TODO@{{ domain }}"
+#  - account: "{{ TODO }}"
+#    domain: "{{ domain }}"
 #    password_hash: TODO
 #    domain_pk_id: 2
 mail_virtual_aliases: