From 291c8747f1460462ff84c608fd25a5fc68016eab Mon Sep 17 00:00:00 2001
From: root <root@squid.localdomain>
Date: Sun, 27 Aug 2017 11:48:51 +0000
Subject: [PATCH] Adding DKIM key generation back from rmilter to rspamd

---
 data/hooks/conf_regen/31-rspamd | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/data/hooks/conf_regen/31-rspamd b/data/hooks/conf_regen/31-rspamd
index afdfc1bf1..1aa38562d 100755
--- a/data/hooks/conf_regen/31-rspamd
+++ b/data/hooks/conf_regen/31-rspamd
@@ -18,6 +18,28 @@ do_post_regen() {
 
   [ -z "$regen_conf_files" ] && exit 0
 
+  # retrieve variables
+  domain_list=$(sudo yunohost domain list --output-as plain --quiet)
+
+  # create DKIM directory with proper permission
+  sudo mkdir -p /etc/dkim
+  sudo chown _rspamd /etc/dkim
+
+  # create DKIM key for domains
+  for domain in "$domain_list"; do
+    domain_key="/etc/dkim/${domain}.mail.key"
+    [ ! -f $domain_key ] && {
+      sudo opendkim-genkey --domain="$domain" \
+          --selector=mail --directory=/etc/dkim
+      sudo mv /etc/dkim/mail.private "$domain_key"
+      sudo mv /etc/dkim/mail.txt "/etc/dkim/${domain}.mail.txt"
+    }
+  done
+
+  # fix DKIM keys permissions
+  sudo chown _rspamd /etc/dkim/*.mail.key
+  sudo chmod 400 /etc/dkim/*.mail.key
+
   # compile sieve script
   [[ "$regen_conf_files" =~ rspamd\.sieve ]] && {
     sudo sievec /etc/dovecot/global_script/rspamd.sieve