paulbsd/paulbsd-salt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated opendkim state

Browse Source
This commit is contained in:
Paul 2023-03-10 00:08:09 +01:00
parent 866f0a7015
commit 354f8a9b82
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
states/opendkim/map.jinja
View File

@ -1,8 +1,7 @@
{%- import_yaml "opendkim/defaults.yaml" as defaults %}
{%- set opendkim = salt['pillar.get'](
'opendkim',
default=defaults.opendkim,
merge=True
)
-%}
{%- set opendkim = salt['pillar.get']('opendkim', default=defaults.opendkim, merge=True)-%}
{%- set net = salt['pillar.get']('net', default=defaults, merge=True) -%}
{%- set hostnames = salt['pillar.get']('mail:hostnames', default=defaults) -%}

12
states/opendkim/templates/TrustedHosts.j2
View File

@ -1,9 +1,9 @@
{%- for key, value in salt['pillar.get']('net:ipv4_networks').items() %}
{{ value.ip }}/{{ value.mask }}
{%- from "opendkim/map.jinja" import opendkim with context %}
{%- from "opendkim/map.jinja" import net with context %}
{%- from "opendkim/map.jinja" import hostnames with context %}
{%- for network in net.ip_networks %}
{{ network }}
{%- endfor %}
{%- for key, value in salt['pillar.get']('net:ipv6_networks').items() %}
{{ value.ip }}/{{ value.mask }}
{%- endfor %}
{%- for hostname in salt['pillar.get']('mail:hostnames') %}
{%- for hostname in hostnames %}
{{ hostname }}
{%- endfor %}