go back to autogenerating dkim keys

1 files changed, 24 insertions, 0 deletions

diff --git a/modules/mail/manifests/mailu.pp b/modules/mail/manifests/mailu.pp
index 010f2f3..805f134 100644
--- a/modules/mail/manifests/mailu.pp
+++ b/modules/mail/manifests/mailu.pp
@@ -3,7 +3,14 @@ class mail::mailu {
   include docker
   include haveged
 
+  package { "opendkim":
+    ensure => installed;
+  }
+
   file {
+    "/media/persistent/dkim":
+      ensure => directory,
+      require => Class["mail::persistent"];
     "/media/persistent/docker-compose.yml":
       content => template("mail/docker-compose.yml.erb"),
       require => Class["mail::persistent"];
@@ -34,6 +41,23 @@ class mail::mailu {
     ];
   }
 
+  exec { "generate dkim keys":
+    provider => shell,
+    command => "
+      opendkim-genkey -s dkim -d new.tozt.net
+      mv dkim.private /media/persistent/dkim/new.tozt.net.dkim.key
+      mv dkim.txt /media/persistent/dkim/new.tozt.net.dkim.pub
+    ",
+    cwd => "/media/persistent",
+    creates => "/media/persistent/dkim/new.tozt.net.dkim.key",
+    require => [
+      Class["haveged"],
+      Package["opendkim"],
+      Class["mail::persistent"],
+      File["/media/persistent/dkim"],
+    ];
+  }
+
   file { "/etc/systemd/system/mailu.service":
     source => "puppet:///modules/mail/mailu.service",
     notify => Exec["/usr/bin/systemctl daemon-reload"];