From 1e1ad61b2ea295ca692a7ff3387c5a8bbc5e004c Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Fri, 31 Jan 2020 03:45:20 +0100
Subject: [PATCH] rspamd: fix DKIM for hostName and polish conf
---
servers/mermet/rspamd.nix | 26 +++++++++----------
.../rspamd/dkim/sourcephile.fr/20200101.dns | 8 ++++++
2 files changed, 21 insertions(+), 13 deletions(-)
create mode 100644 servers/mermet/rspamd/dkim/sourcephile.fr/20200101.dns
diff --git a/servers/mermet/rspamd.nix b/servers/mermet/rspamd.nix
index 07a2f07..f061cb4 100644
--- a/servers/mermet/rspamd.nix
+++ b/servers/mermet/rspamd.nix
@@ -1,5 +1,5 @@
{ pkgs, lib, config, ... }:
-let inherit (builtins) attrNames listToAttrs;
+let inherit (builtins) attrNames listToAttrs readFile;
inherit (builtins.extraBuiltins) pass pass-chomp;
inherit (lib) types;
inherit (pkgs.lib) unlinesAttrs;
@@ -31,21 +31,21 @@ in
dkim = {
enable = true;
domains = {
- "${networking.domainBase}.fr" = {
+ "${networking.hostName}" = {
selector = "20200101";
selectors = {
"20200101" = {
- key = "dkim/${networking.domainBase}.20200101.key";
- dns = ''
- 20200101._domainkey IN TXT ( "v=DKIM1; k=rsa; "
- "p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7EKzverbG+5JF+yFjH3MrxLyauiHyLqBbV/8LEMunoKXF8sqhBpQtAQXruLqsyUkxR/4CAyPMyzmcdrU43boMj9yFqLrg/kEz2RIvai9jXBqRoWRW1y7F0LbZmdtOTncuDSP8Zzo02XUzsOC4f/C3tEQHS5rc"
- "hzfhU5FY1CeO6eBMV79qKBOvGMKahQTrrtU6olAAJxOhn6wRuwSf"
- "+m3on1OqiuXYYIgNHKdRhJ8gDwIm/3LEpYMD0gTgJiyclCLoLGHGtKZy1Wf9xV9/7V6fHE4JW5SDivwslVTL+KPXOlIpo5NDHpMxPYOcIg2K4Rj/j7jhavo+fG43q1LhwaPkEMQMbplgnjeMY8300odRiklTkMMpH0m35ZNeHQJSRpEtV8y5xUNxVaGzfqX5iStwV/mQ1Kn"
- "ZSe8ORTNq+eTTFnDk6zdUXjagcf0wO6QsSTeAz/G8CqOBbwmrU+q"
- "F8WbGAeRnhz51mH6fTTfsQ1nwjAiF4ou+eQGTkTMN23KkCKpuozJnxqx4DCEr6J1bL83fhXw7CgcfgKgTOk/HFJpeiGhqodw18r4DWBA6G57z9utm7Mr/9SoVnMq6iK9iEcbCllLR8Sz4viatLSRzhodbk7hfvXS3jmCFjILAjFmA7aMTemDMBDQhpAGF9F8sjFUbEJIZjK"
- "rWWtSTdO8DilDqN8CAwEAAQ=="
- );
- '';
+ key = "dkim/${networking.domain}/20200101.key";
+ dns = readFile (rspamd/dkim + "/${networking.domain}/20200101.dns");
+ };
+ };
+ };
+ "${networking.domain}" = {
+ selector = "20200101";
+ selectors = {
+ "20200101" = {
+ key = "dkim/${networking.domain}/20200101.key";
+ dns = readFile (rspamd/dkim + "/${networking.domain}/20200101.dns");
};
};
};
diff --git a/servers/mermet/rspamd/dkim/sourcephile.fr/20200101.dns b/servers/mermet/rspamd/dkim/sourcephile.fr/20200101.dns
new file mode 100644
index 0000000..24f0984
--- /dev/null
+++ b/servers/mermet/rspamd/dkim/sourcephile.fr/20200101.dns
@@ -0,0 +1,8 @@
+20200101._domainkey IN TXT ( "v=DKIM1; k=rsa; "
+ "p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA7EKzverbG+5JF+yFjH3MrxLyauiHyLqBbV/8LEMunoKXF8sqhBpQtAQXruLqsyUkxR/4CAyPMyzmcdrU43boMj9yFqLrg/kEz2RIvai9jXBqRoWRW1y7F0LbZmdtOTncuDSP8Zzo02XUzsOC4f/C3tEQHS5rc"
+ "hzfhU5FY1CeO6eBMV79qKBOvGMKahQTrrtU6olAAJxOhn6wRuwSf"
+ "+m3on1OqiuXYYIgNHKdRhJ8gDwIm/3LEpYMD0gTgJiyclCLoLGHGtKZy1Wf9xV9/7V6fHE4JW5SDivwslVTL+KPXOlIpo5NDHpMxPYOcIg2K4Rj/j7jhavo+fG43q1LhwaPkEMQMbplgnjeMY8300odRiklTkMMpH0m35ZNeHQJSRpEtV8y5xUNxVaGzfqX5iStwV/mQ1Kn"
+ "ZSe8ORTNq+eTTFnDk6zdUXjagcf0wO6QsSTeAz/G8CqOBbwmrU+q"
+ "F8WbGAeRnhz51mH6fTTfsQ1nwjAiF4ou+eQGTkTMN23KkCKpuozJnxqx4DCEr6J1bL83fhXw7CgcfgKgTOk/HFJpeiGhqodw18r4DWBA6G57z9utm7Mr/9SoVnMq6iK9iEcbCllLR8Sz4viatLSRzhodbk7hfvXS3jmCFjILAjFmA7aMTemDMBDQhpAGF9F8sjFUbEJIZjK"
+ "rWWtSTdO8DilDqN8CAwEAAQ=="
+)
--
2.47.2