Browse Source

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

Thomas Buck 5 years ago
parent
commit
e452e31e42

+ 3
- 2
group_vars/sovereign View File

12
 # fail2ban reports will be sent to this address
12
 # fail2ban reports will be sent to this address
13
 admin_email: "{{ main_user_name }}@{{ domain }}"
13
 admin_email: "{{ main_user_name }}@{{ domain }}"
14
 
14
 
15
-# mail
16
-mail_virtual_domains:
15
+virtual_domains:
17
   - name: "{{ domain }}"
16
   - name: "{{ domain }}"
18
     pk_id: 1
17
     pk_id: 1
18
+
19
+# mail
19
 mail_virtual_users:
20
 mail_virtual_users:
20
   - account: "{{ main_user_name }}"
21
   - account: "{{ main_user_name }}"
21
     domain: "{{ domain }}"
22
     domain: "{{ domain }}"

+ 1
- 1
roles/mailserver/tasks/dovecot.yml View File

24
 
24
 
25
 - name: Ensure mail domain directories are in place
25
 - name: Ensure mail domain directories are in place
26
   file: state=directory path=/data/{{ item.name }} owner=vmail group=dovecot mode=0770
26
   file: state=directory path=/data/{{ item.name }} owner=vmail group=dovecot mode=0770
27
-  with_items: '{{ mail_virtual_domains }}'
27
+  with_items: '{{ virtual_domains }}'
28
 
28
 
29
 - name: Ensure mail directories are in place
29
 - name: Ensure mail directories are in place
30
   file: state=directory path=/data/{{ item.domain }}/{{ item.account }} owner=vmail group=dovecot
30
   file: state=directory path=/data/{{ item.domain }}/{{ item.account }} owner=vmail group=dovecot

+ 1
- 1
roles/mailserver/tasks/rspamd.yml View File

53
   args:
53
   args:
54
     creates: /var/lib/rspamd/dkim/{{ item.name }}.default.key
54
     creates: /var/lib/rspamd/dkim/{{ item.name }}.default.key
55
     chdir: /var/lib/rspamd/dkim/
55
     chdir: /var/lib/rspamd/dkim/
56
-  with_items: "{{ mail_virtual_domains }}"
56
+  with_items: "{{ virtual_domains }}"
57
 
57
 
58
 - name: Start redis
58
 - name: Start redis
59
   service: name=redis-server state=started
59
   service: name=redis-server state=started

+ 1
- 1
roles/mailserver/templates/mailserver.sql.j2 View File

35
 
35
 
36
 CREATE INDEX source_idx ON virtual_aliases (source);
36
 CREATE INDEX source_idx ON virtual_aliases (source);
37
 
37
 
38
-{% for virtual_domain in mail_virtual_domains %}
38
+{% for virtual_domain in virtual_domains %}
39
 INSERT INTO "virtual_domains" ("id", "name")
39
 INSERT INTO "virtual_domains" ("id", "name")
40
         VALUES ('{{ virtual_domain.pk_id }}', '{{ virtual_domain.name }}');
40
         VALUES ('{{ virtual_domain.pk_id }}', '{{ virtual_domain.name }}');
41
 {% endfor %}
41
 {% endfor %}

Loading…
Cancel
Save