Преглед изворни кода

Merge pull request #104 from bcachet/feature/FixMailVirtualListUsage

fix(mail): main_virtual_xx variables usage
Luke Cyca пре 11 година
родитељ
комит
57b86b0ec1

+ 2
- 4
roles/mailserver/tasks/dovecot.yml Прегледај датотеку

16
 
16
 
17
 - name: Ensure mail domain directories are in place
17
 - name: Ensure mail domain directories are in place
18
   file: state=directory path=/decrypted/{{ item.name }} owner=vmail group=dovecot mode=770
18
   file: state=directory path=/decrypted/{{ item.name }} owner=vmail group=dovecot mode=770
19
-  with_items:
20
-    - "{{ mail_virtual_domains }}"
19
+  with_items: mail_virtual_domains
21
 
20
 
22
 - name: Ensure mail directories are in place
21
 - name: Ensure mail directories are in place
23
   file: state=directory path=/decrypted/{{ item.name }}/{{ item.primary_user }} owner=vmail group=dovecot
22
   file: state=directory path=/decrypted/{{ item.name }}/{{ item.primary_user }} owner=vmail group=dovecot
24
-  with_items:
25
-    - "{{ mail_virtual_domains }}"
23
+  with_items: mail_virtual_domains
26
 
24
 
27
 - name: Copy dovecot.conf into place
25
 - name: Copy dovecot.conf into place
28
   copy: src=etc_dovecot_dovecot.conf dest=/etc/dovecot/dovecot.conf
26
   copy: src=etc_dovecot_dovecot.conf dest=/etc/dovecot/dovecot.conf

+ 1
- 2
roles/mailserver/tasks/dspam.yml Прегледај датотеку

31
 
31
 
32
 - name: Put sieve rules into each primary user directory
32
 - name: Put sieve rules into each primary user directory
33
   copy: src=dot_dovecot.sieve dest=/decrypted/{{ item.name }}/{{ item.primary_user }}/.dovecot.sieve owner=vmail group=dovecot
33
   copy: src=dot_dovecot.sieve dest=/decrypted/{{ item.name }}/{{ item.primary_user }}/.dovecot.sieve owner=vmail group=dovecot
34
-  with_items:
35
-    - "{{ mail_virtual_domains }}"
34
+  with_items: mail_virtual_domains
36
   notify: restart dovecot
35
   notify: restart dovecot

+ 2
- 4
roles/mailserver/tasks/opendkim.yml Прегледај датотеку

12
 
12
 
13
 - name: Create OpenDKIM key directories
13
 - name: Create OpenDKIM key directories
14
   file: state=directory path=/etc/opendkim/keys/{{ item.name }} group=opendkim owner=opendkim
14
   file: state=directory path=/etc/opendkim/keys/{{ item.name }} group=opendkim owner=opendkim
15
-  with_items:
16
-    - "{{ mail_virtual_domains }}"
15
+  with_items: mail_virtual_domains
17
 
16
 
18
 - name: Generate OpenDKIM keys
17
 - name: Generate OpenDKIM keys
19
   command: opendkim-genkey -r -d {{ item.name }} -D /etc/opendkim/keys/{{ item.name }}/ creates=/etc/opendkim/keys/{{ item.name }}/default.private
18
   command: opendkim-genkey -r -d {{ item.name }} -D /etc/opendkim/keys/{{ item.name }}/ creates=/etc/opendkim/keys/{{ item.name }}/default.private
20
-  with_items:
21
-    - "{{ mail_virtual_domains }}"
19
+  with_items: mail_virtual_domains
22
 
20
 
23
 - name: Put opendkim.conf into place
21
 - name: Put opendkim.conf into place
24
   copy: src=etc_opendkim.conf dest=/etc/opendkim.conf owner=opendkim group=opendkim
22
   copy: src=etc_opendkim.conf dest=/etc/opendkim.conf owner=opendkim group=opendkim

Loading…
Откажи
Сачувај