From 53e0cdd17139bdd3e6df079edec3c88ef12a5c1a Mon Sep 17 00:00:00 2001
From: Jon Lockwood <jonathon.lockwood@networkedweb.com>
Date: Wed, 16 Feb 2022 14:17:26 +0930
Subject: [PATCH] refactor(amavis): move dkim key config to own file

using a seperate file for the DKIM key configuration enables the user
to easily configure with their settings.

MR !4
---
 include/etc/amavis/conf.d/90-dkim      | 16 ----------------
 include/etc/amavis/conf.d/99-dkim-keys | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 include/etc/amavis/conf.d/99-dkim-keys

diff --git a/include/etc/amavis/conf.d/90-dkim b/include/etc/amavis/conf.d/90-dkim
index f682d82..14fbb69 100644
--- a/include/etc/amavis/conf.d/90-dkim
+++ b/include/etc/amavis/conf.d/90-dkim
@@ -1,19 +1,3 @@
-dkim_key(
-    'example.org',
-    'dkim',
-    '/certs/amavis/dkim/example.org.dkim.pem'
-);
-
-
-@dkim_signature_options_bysender_maps = (
-    {
-        "example.org" => {
-            d   => 'example.org',
-            a   => 'rsa-sha256',
-            ttl => 10*24*3600
-        }
-    }
-);
 
 $enable_dkim_signing = 1;
 
diff --git a/include/etc/amavis/conf.d/99-dkim-keys b/include/etc/amavis/conf.d/99-dkim-keys
new file mode 100644
index 0000000..4b374a2
--- /dev/null
+++ b/include/etc/amavis/conf.d/99-dkim-keys
@@ -0,0 +1,18 @@
+dkim_key(
+    'example.org',
+    'dkim',
+    '/certs/amavis/dkim/example.org.dkim.pem'
+);
+
+
+@dkim_signature_options_bysender_maps = (
+    {
+        "example.org" => {
+            s   => 'dkim',
+            d   => 'example.org',
+            a   => 'rsa-sha256',
+            ttl => 10*24*3600
+        }
+    }
+);
+