Rename mail_virtual_domains to only virtual_domains, will later also use for web.

group_vars/sovereign

@@ -12,10 +12,11 @@ organization: (required)
 # fail2ban reports will be sent to this address
 admin_email: "{{ main_user_name }}@{{ domain }}"
 
-# mail
-mail_virtual_domains:
+virtual_domains:
   - name: "{{ domain }}"
     pk_id: 1
+
+# mail
 mail_virtual_users:
   - account: "{{ main_user_name }}"
     domain: "{{ domain }}"

roles/mailserver/tasks/dovecot.yml

@@ -24,7 +24,7 @@
 
 - name: Ensure mail domain directories are in place
   file: state=directory path=/data/{{ item.name }} owner=vmail group=dovecot mode=0770
-  with_items: '{{ mail_virtual_domains }}'
+  with_items: '{{ virtual_domains }}'
 
 - name: Ensure mail directories are in place
   file: state=directory path=/data/{{ item.domain }}/{{ item.account }} owner=vmail group=dovecot

roles/mailserver/tasks/rspamd.yml

@@ -53,7 +53,7 @@
   args:
     creates: /var/lib/rspamd/dkim/{{ item.name }}.default.key
     chdir: /var/lib/rspamd/dkim/
-  with_items: "{{ mail_virtual_domains }}"
+  with_items: "{{ virtual_domains }}"
 
 - name: Start redis
   service: name=redis-server state=started

roles/mailserver/templates/mailserver.sql.j2

@@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS "virtual_aliases" (
 
 CREATE INDEX source_idx ON virtual_aliases (source);
 
-{% for virtual_domain in mail_virtual_domains %}
+{% for virtual_domain in virtual_domains %}
 INSERT INTO "virtual_domains" ("id", "name")
         VALUES ('{{ virtual_domain.pk_id }}', '{{ virtual_domain.name }}');
 {% endfor %}