Fix to correct enabling DKIM at install time

virtualmin · Apr 27, 2024 · 9fc2ba5 · 9fc2ba5
1 parent 9df6b65
commit 9fc2ba5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/lib/Virtualmin/Config/Plugin/Postfix.pm b/lib/Virtualmin/Config/Plugin/Postfix.pm
@@ -260,21 +260,6 @@ sub actions {
       print STDERR "Failed to start Postfix!\n" if ($err);
     }
 
-    # Enable DKIM at install time
-    my $dkim = &get_dkim_config();
-    if (!$dkim) {
-      $dkim = { 'selector' => get_default_dkim_selector(),
-	        'sign' => 1,
-		'enabled' => 1,
-		'extra' => [ get_system_hostname() ],
-	      };
-      my $ok = enable_dkim($dkim, 0, 2048);
-      if ($ok) {
-        $config{'dkim_enabled'} = 1;
-	save_module_config();
-      }
-    }
-
     $self->done(1);    # OK!
   };
   if ($@) {

diff --git a/lib/Virtualmin/Config/Plugin/Virtualmin.pm b/lib/Virtualmin/Config/Plugin/Virtualmin.pm
@@ -114,6 +114,25 @@ sub actions {
       }
     }
 
+    # Enable DKIM at install time
+    if (-r "/etc/opendkim.conf") {
+      foreign_require("virtual-server");
+      my $dkim = virtual_server::get_dkim_config();
+      if (ref($dkim) && !$dkim->{'enabled'}) {
+        $dkim->{'selector'} = virtual_server::get_default_dkim_selector();
+        $dkim->{'sign'} = 1;
+        $dkim->{'enabled'} = 1;
+        $dkim->{'extra'} = [ get_system_hostname() ];
+        virtual_server::push_all_print();
+        virtual_server::set_all_null_print();
+        my $ok = virtual_server::enable_dkim($dkim, 1, 2048);
+        virtual_server::pop_all_print();
+        if ($ok) {
+          $vconfig{'dkim_enabled'} = 1;
+        }
+      }
+    }
+
     save_module_config(\%vconfig, "virtual-server");
 
     # Configure the Read User Mail module to look for sub-folders