updated opendkim state

This commit is contained in:
Paul 2023-01-04 23:32:42 +01:00
parent ebf74d4df6
commit d067176aab
8 changed files with 12 additions and 12 deletions

View File

@ -10,7 +10,7 @@ opendkim-config-dir:
opendkim-configuration-key:
file.managed:
- name: {{ opendkim.config.dir }}/{{ opendkim.config.key.name }}
- source: salt://opendkim/key.j2
- source: salt://opendkim/templates/key.j2
- user: {{ opendkim.config.user }}
- group: {{ opendkim.config.group }}
- mode: 600
@ -21,7 +21,7 @@ opendkim-configuration-key:
opendkim-trusted-hosts:
file.managed:
- name: {{ opendkim.config.dir }}/TrustedHosts
- source: salt://opendkim/TrustedHosts.j2
- source: salt://opendkim/templates/TrustedHosts.j2
- user: {{ opendkim.config.user }}
- group: {{ opendkim.config.group }}
- mode: 644
@ -32,7 +32,7 @@ opendkim-trusted-hosts:
opendkim-service-defaults:
file.managed:
- name: {{ opendkim.config.default_file }}
- source: salt://opendkim/service_defaults.j2
- source: salt://opendkim/templates/service_defaults.j2
- user: {{ opendkim.config.user }}
- group: {{ opendkim.config.group }}
- mode: 644
@ -43,7 +43,7 @@ opendkim-service-defaults:
opendkim-config-file:
file.managed:
- name: {{ opendkim.config.file }}
- source: salt://opendkim/opendkim.conf.j2
- source: salt://opendkim/templates/opendkim.conf.j2
- user: {{ opendkim.config.user }}
- group: {{ opendkim.config.group }}
- mode: 644

View File

@ -1,6 +1,9 @@
---
opendkim:
enabled: true
pkgs:
- opendkim
- opendkim-tools
config:
dir: '/etc/opendkim'
file: '/etc/opendkim.conf'

View File

@ -1,5 +1,4 @@
---
{%- from "opendkim/map.jinja" import opendkim with context %}
include:
- .install
- .config

View File

@ -2,6 +2,4 @@
{%- from "opendkim/map.jinja" import opendkim with context %}
opendkim-pkg:
pkg.installed:
- pkgs:
- opendkim
- opendkim-tools
- pkgs: {{ opendkim.pkgs }}

View File

@ -6,4 +6,4 @@
{%- endfor %}
{%- for hostname in salt['pillar.get']('mail:hostnames') %}
{{ hostname }}
{%- endfor %}
{%- endfor %}

View File

@ -1,2 +1,2 @@
{%- from "opendkim/map.jinja" import opendkim with context -%}
{{ opendkim.config.key.content }}
{{ opendkim.config.key.content }}

View File

@ -20,4 +20,4 @@ PidFile {{ opendkim.config.pid_file }}
Socket inet:{{ opendkim.config.port }}@{{ opendkim.config.host }}
ReportAddress {{ opendkim.config.notify_addr }}
SendReports {{ opendkim.config.notify_report }}
SendReports {{ opendkim.config.notify_report }}

View File

@ -1,2 +1,2 @@
{%- from "opendkim/map.jinja" import opendkim with context %}
SOCKET="inet:{{ opendkim.config.port }}@{{ opendkim.config.host }}"
SOCKET="inet:{{ opendkim.config.port }}@{{ opendkim.config.host }}"