Browse Source

adjustments to get it working with postfix

master
parent
commit
4e91933a88
6 changed files with 34 additions and 17 deletions
  1. +1
    -0
      defaults/main.yaml
  2. +5
    -0
      handlers/main.yaml
  3. +13
    -10
      tasks/main.yaml
  4. +6
    -0
      tasks/test.yaml
  5. +3
    -7
      templates/opendkim.conf.j2
  6. +6
    -0
      templates/trusted.hosts.j2

+ 1
- 0
defaults/main.yaml View File

@@ -2,3 +2,4 @@
dkim_domains: [] dkim_domains: []
dkim_selector: "{{ inventory_hostname_short }}" dkim_selector: "{{ inventory_hostname_short }}"
opendkim_key_size: 2048 opendkim_key_size: 2048
opendkim_socket: local:/var/run/opendkim/opendkim.sock

+ 5
- 0
handlers/main.yaml View File

@@ -1,5 +1,10 @@
--- ---


- name: restart opendkim
service:
name: opendkim
state: restarted

- name: reload opendkim - name: reload opendkim
service: service:
name: opendkim name: opendkim


+ 13
- 10
tasks/main.yaml View File

@@ -11,7 +11,7 @@
template: template:
src: opendkim.conf.j2 src: opendkim.conf.j2
dest: /etc/opendkim.conf dest: /etc/opendkim.conf
notify: reload opendkim
notify: restart opendkim


- name: opendkim config directory - name: opendkim config directory
file: file:
@@ -39,6 +39,7 @@
group: opendkim group: opendkim
mode: 0600 mode: 0600
with_items: "{{dkim_domains}}" with_items: "{{dkim_domains}}"
notify: reload opendkim


- name: dkim public keys - name: dkim public keys
openssl_publickey: openssl_publickey:
@@ -48,6 +49,7 @@
group: opendkim group: opendkim
mode: 0600 mode: 0600
with_items: "{{dkim_domains}}" with_items: "{{dkim_domains}}"
notify: reload opendkim


- name: read dkim public keys - name: read dkim public keys
command: cat /etc/opendkim/keys/{{item}}/{{dkim_selector}}.public command: cat /etc/opendkim/keys/{{item}}/{{dkim_selector}}.public
@@ -59,28 +61,29 @@
debug: debug:
msg: "{{_dkim_dns_records}}" msg: "{{_dkim_dns_records}}"


- name: test dkim dns records
command: opendkim-testkey -v -d {{item}} -s {{dkim_selector}} -k /etc/opendkim/keys/{{item}}/{{dkim_selector}}.private
changed_when: false
with_items: "{{dkim_domains}}"

- name: opendkim key table - name: opendkim key table
template: template:
src: key.table.j2 src: key.table.j2
dest: /etc/opendkim/key.table dest: /etc/opendkim/key.table
mode: 0600
group: opendkim
mode: 0640
notify: reload opendkim


- name: opendkim signing table - name: opendkim signing table
template: template:
src: signing.table.j2 src: signing.table.j2
dest: /etc/opendkim/signing.table dest: /etc/opendkim/signing.table
mode: 0600
group: opendkim
mode: 0640
notify: reload opendkim


- name: opendkim signing table
- name: opendkim trusted hosts
template: template:
src: trusted.hosts.j2 src: trusted.hosts.j2
dest: /etc/opendkim/trusted.hosts dest: /etc/opendkim/trusted.hosts
mode: 0600
group: opendkim
mode: 0640
notify: reload opendkim


- name: test opendkim configuration - name: test opendkim configuration
command: opendkim -n command: opendkim -n


+ 6
- 0
tasks/test.yaml View File

@@ -0,0 +1,6 @@
---

- name: test dkim dns records
command: opendkim-testkey -v -d {{item}} -s {{dkim_selector}} -k /etc/opendkim/keys/{{item}}/{{dkim_selector}}.private
changed_when: false
with_items: "{{dkim_domains}}"

+ 3
- 7
templates/opendkim.conf.j2 View File

@@ -10,10 +10,9 @@ Syslog yes
# privileged user (e.g. Postfix) # privileged user (e.g. Postfix)
UMask 007 UMask 007


ExternalIgnoreList file:/etc/opendkim/trusted.hosts
InternalHosts file:/etc/opendkim/trusted.hosts
InternalHosts /etc/opendkim/trusted.hosts


KeyTable file:/etc/opendkim/key.table
KeyTable /etc/opendkim/key.table
SigningTable refile:/etc/opendkim/signing.table SigningTable refile:/etc/opendkim/signing.table


# Commonly-used options; the commented-out versions show the defaults. # Commonly-used options; the commented-out versions show the defaults.
@@ -21,8 +20,6 @@ SigningTable refile:/etc/opendkim/signing.table
#Mode sv #Mode sv
#SubDomains no #SubDomains no


# Socket smtp://localhost
#
# ## Socket socketspec # ## Socket socketspec
# ## # ##
# ## Names the socket where this filter should listen for milter connections # ## Names the socket where this filter should listen for milter connections
@@ -32,8 +29,7 @@ SigningTable refile:/etc/opendkim/signing.table
# ## inet:port to listen on all interfaces # ## inet:port to listen on all interfaces
# ## local:/path/to/socket to listen on a UNIX domain socket # ## local:/path/to/socket to listen on a UNIX domain socket
# #
#Socket inet:8892@localhost
Socket local:/var/run/opendkim/opendkim.sock
Socket {{opendkim_socket}}


## PidFile filename ## PidFile filename
### default (none) ### default (none)


+ 6
- 0
templates/trusted.hosts.j2 View File

@@ -1 +1,7 @@
{{ansible_managed|comment}} {{ansible_managed|comment}}

::1
127.0.0.1
localhost
ip6-localhost
ip6-loopback

Loading…
Cancel
Save