Maje the DKIM selector configurable

roles/common/defaults/main.yml

@@ -84,6 +84,7 @@ ssl_certs: []
 ssl_certs_auto: []
 
 dkim_domains: []
+dkim_selector: 'default'
 with_opendkim: False
 
 # vim: ft=yaml.ansible

roles/common/tasks/dkim.yml

@@ -68,12 +68,12 @@
 - name: 'Install DKIM private keys'
   copy:
     content: "{{ lookup('file', 'data/dkim/' + item + '.pem') }}"
-    dest: '/etc/opendkim/{{ item }}_default.pem'
+    dest: '/etc/opendkim/{{ item }}_{{ dkim_selector }}.pem'
     owner: 'root'
     group: 'opendkim'
     mode: '0640'
   with_items: '{{ dkim_domains }}'
-  when: dkim_domains
+  when: dkim_domains|length > 0
   tags:
     - 'dkim'
 

roles/common/templates/opendkim/KeyTable.j2

@@ -3,5 +3,5 @@
 {{ prolog() }}
 {% endif -%}
 {% for domain in dkim_domains %}
-default._domainkey.{{ domain }} {{ domain }}:default:/etc/opendkim/{{ domain }}_default.pem
+{{ dkim_selector }}._domainkey.{{ domain }} {{ domain }}:{{ dkim_selector }}:/etc/opendkim/{{ domain }}_{{ dkim_selector }}.pem
 {% endfor %}

roles/common/templates/opendkim/SigningTable.j2

@@ -3,5 +3,5 @@
 {{ prolog() }}
 {% endif -%}
 {% for domain in dkim_domains %}
-*@{{ domain }} default._domainkey.{{ domain }}
+*@{{ domain }} {{ dkim_selector }}._domainkey.{{ domain }}
 {% endfor %}