Skip to content

Commit 5b06aef

Browse files
committed
insert our preferred nameserver into opendkim.conf
Use our version of ansible-dkim to insert Nameservers clause into opendkim.conf
1 parent bebfb39 commit 5b06aef

File tree

6 files changed

+10
-4
lines changed

6 files changed

+10
-4
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,6 @@
4040
[submodule "repos/pve-nag-buster"]
4141
path = repos/pve-nag-buster
4242
url = [email protected]:foundObjects/pve-nag-buster.git
43+
[submodule "repos/ansible-dkim"]
44+
path = repos/ansible-dkim
45+
url = [email protected]:spacelama/ansible-dkim.git

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ radio0 and radio1 pci/hardware devices in /etc/config/wireless.
120120
* You probably want to install `ansible-mitogen` (and `python3-mitogen`) on your Ansible server too, for my ansible.cfg sets `strategy = mitogen_linear` to greatly accelerate the playbook (it works with that setting disabled if you can't install migoten, but mitogen has never created any detectable problems for me). I have only tested this from a Debian machine (Debian 11,12).
121121
* Ideally, you'd create a gpg encrypted file in misc/vault-password.gpg, and verify it can be read with: misc/get-vault-pass.sh
122122
* OpenWRT plays rely on [ansible-openwrt](https://github.com/gekmihesg/ansible-openwrt), which is published as a [galaxy collection](https://galaxy.ansible.com/ui/repo/published/nn708/openwrt/).
123-
* Tasmota plays rely on [ansible-tasmota](https://github.com/tobias-richter/ansible-tasmota), which is available through [ansible galaxy](https://galaxy.ansible.com/ui/standalone/roles/tobias_richter/tasmota/), but which [I've modified](https://github.com/spacelama/ansible-tasmota) and included in this repo to allow for and transparently recovers from the Tasmota device spontaneously rebooting after certain configurations are applied.
124-
* The SMTP plays setup DKIM signatures via [ansible-dkim](https://github.com/FoxyRoles/ansible-dkim), which is published through [ansible galaxy](https://galaxy.ansible.com/ui/standalone/roles/sunfoxcz/dkim/).
123+
* Tasmota plays rely on [ansible-tasmota](https://github.com/tobias-richter/ansible-tasmota), which is available through [ansible galaxy](https://galaxy.ansible.com/ui/standalone/roles/tobias_richter/tasmota/), but which [I had modified](https://github.com/spacelama/ansible-tasmota) (but which got merged into upstream) to allow for and transparently recovers from the Tasmota device spontaneously rebooting after certain configurations are applied.
124+
* The SMTP plays setup DKIM signatures via [ansible-dkim](https://github.com/FoxyRoles/ansible-dkim), which is published through [ansible galaxy](https://galaxy.ansible.com/ui/standalone/roles/sunfoxcz/dkim/), but which [I've modified](https://github.com/spacelama/ansible-dkim) and included in this repo to allow for other opendkim parameters I need.
125125

126126
# Initial playbook setup and Configuration
127127

repos/ansible-dkim

Submodule ansible-dkim added at 882fccd

roles/ansible-dkim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../repos/ansible-dkim

roles/smtp/tasks/dkim.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
# become: true
1111

1212
- include_role:
13-
name: sunfoxcz.dkim
13+
name: ansible-dkim
1414

1515
- name: Make sure all handlers run
1616
meta: flush_handlers
1717

1818
- debug:
19-
msg: "copy /etc/opendkim/keys/{{ dkim_domains }}/{{ dkim_selector }}.txt variable to your DNS, then test with: echo This is a test mailing | mail -s \"test $(date)\" -r {{ dkim_admin_email }} [email protected]"
19+
msg: "copy /etc/opendkim/keys/{{ dkim_domains[0] }}/{{ dkim_selector }}.txt variable to your DNS, then test with: echo This is a test mailing | mail -s \"test $(date)\" -r {{ dkim_admin_email }} [email protected]"
2020

2121
#WARNING: https://wiki.debian.org/opendkim: Postfix does not pass internally-generated messages such as bounce messages to opendkim, so by default bounces are not DKIM-signed. This can be a problem if you also use a strict DMARC policy, because it may cause your unsigned bounce messages themselves to get rejected. The internal_mail_filter_classes parameter can be used to pass bounces through the milters as well

vars/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
- rather.puzzling.org
3434
# - timconnors.org
3535
dkim_same_key: false
36+
dkim_conf_override: Nameservers 127.0.0.1
3637

3738
dovecot_insecure_logfile_creation: true
3839
smtp_crontab:

0 commit comments

Comments
 (0)