diff options
| author |  Joe Banks <[email protected]> | 2024-08-03 21:44:04 +0100 |
|---|---|---|
| committer | Joe Banks <[email protected]> | 2024-08-03 21:44:04 +0100 |
| commit | 02a86cb9065da923de3da729d46a7df67c6ed09e (patch) | |
| tree | 5fd80fde80392ac3cc376bc06bb3ffec85c6b098 | |
| parent | Remove DMARC alias (diff) | |
Allow for additional keys to be reused on subdomains in OpenDKIM
| -rw-r--r-- | ansible/roles/opendkim/tasks/main.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/opendkim/vars/main.yml | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ansible/roles/opendkim/tasks/main.yml b/ansible/roles/opendkim/tasks/main.yml index 640f0d8..8db4c9b 100644 --- a/ansible/roles/opendkim/tasks/main.yml +++ b/ansible/roles/opendkim/tasks/main.yml @@ -68,7 +68,10 @@ copy: content: | {% for item in opendkim_domains %} - {{ item }} {{ item }}:{{ opendkim_selector }}:/etc/dkimkeys/{{ item }}/{{ opendkim_selector}}.private + {{ item }} {{ item }}:{{ opendkim_selector }}:/etc/dkimkeys/{{ item }}/{{ opendkim_selector }}.private + {% endfor %} + {% for item in opendkim_extra_signings %} + {{ item['domain'] }} {{ item['domain'] }}:{{ opendkim_selector }}:/etc/dkimkeys/{{ item['use_key'] }}/{{ opendkim_selector }}.private {% endfor %} dest: /etc/opendkim/keytable owner: opendkim @@ -85,6 +88,9 @@ {% for item in opendkim_domains %} *@{{ item }} {{ item }} {% endfor %} + {% for item in opendkim_extra_signings %} + *@{{ item['domain'] }} {{ item['domain'] }} + {% endfor %} dest: /etc/opendkim/signingtable owner: opendkim group: opendkim diff --git a/ansible/roles/opendkim/vars/main.yml b/ansible/roles/opendkim/vars/main.yml index 34aa51c..fa43794 100644 --- a/ansible/roles/opendkim/vars/main.yml +++ b/ansible/roles/opendkim/vars/main.yml @@ -3,4 +3,7 @@ opendkim_domains: - pydis.wtf - pydis.com - pythondiscord.com +opendkim_extra_signings: + - domain: int.pydis.wtf + use_key: pydis.wtf opendkim_selector: lovelace |