Page MenuHomeDevCentral
Files F3938619

D3552.diff
No OneTemporary
Actions

D3552.diff
View Options

diff --git a/roles/mailserver/dkim/config.sls b/roles/mailserver/dkim/config.sls
--- a/roles/mailserver/dkim/config.sls
+++ b/roles/mailserver/dkim/config.sls
@@ -9,7 +9,19 @@
{% from "map.jinja" import dirs with context %}
# -------------------------------------------------------------
-# OpenDKIM configuration files
+# OpenDKIM main configuration
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ dirs.etc }}/opendkim/opendkim.conf:
+ file.managed:
+ - source: salt://roles/mailserver/dkim/files/opendkim.conf
+ - template: jinja
+ - context:
+ dirs: {{ dirs }}
+ socket: /var/run/milteropendkim/opendkim.sock
+
+# -------------------------------------------------------------
+# OpenDKIM configuration tables
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
opendkim_config_files:
@@ -27,3 +39,19 @@
- dir_mode: 711
- user: opendkim
- group: opendkim
+
+# -------------------------------------------------------------
+# Clean up
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{% set opendkim_package_leftovers = [
+ "/usr/local/etc/mail/opendkim.conf",
+ "/usr/local/etc/mail/opendkim.conf.sample",
+ "/usr/local/etc/mail",
+]
+%}
+
+{% for path in opendkim_package_leftovers %}
+{{ path }}:
+ file.absent
+{% endfor %}
diff --git a/roles/mailserver/dkim/files/opendkim.conf b/roles/mailserver/dkim/files/opendkim.conf
new file mode 100644
--- /dev/null
+++ b/roles/mailserver/dkim/files/opendkim.conf
@@ -0,0 +1,45 @@
+# -------------------------------------------------------------
+# OpenDKIM
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Source file: roles/mailserver/dkim/files/opendkim.conf
+# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
+
+# -------------------------------------------------------------
+# Socket
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+Socket local:{{ socket }}
+
+# -------------------------------------------------------------
+# Tables
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+SigningTable file:{{ dirs.etc }}/opendkim/SigningTable
+KeyTable file:{{ dirs.etc }}/opendkim/KeyTable
+
+# -------------------------------------------------------------
+# Signing
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+Mode sv
+SignatureAlgorithm rsa-sha256
+
+ExternalIgnoreList refile:{{ dirs.etc }}/opendkim/TrustedHosts
+InternalHosts refile:{{ dirs.etc }}/opendkim/TrustedHosts
+
+# -------------------------------------------------------------
+# Log
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+SysLog Yes
+SyslogFacility mail
+SyslogSuccess false

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 03:43 (8 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2314412
Default Alt Text
D3552.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator