Merge branch 'dovecot-migration-compat' into 'master'

dovecot: add compat shim for dovecot unit name migration

See merge request simple-nixos-mailserver/nixos-mailserver!424

mail-server/dovecot.nix

@@ -16,6 +16,7 @@
 
 {
   config,
+  options,
   pkgs,
   lib,
   ...
@@ -26,6 +27,8 @@ with (import ./common.nix { inherit config pkgs lib; });
 let
   cfg = config.mailserver;
 
+  dovecotUnitName = if lib.hasAttr "dovecot" options.systemd.services then "dovecot" else "dovecot2";
+
   passwdDir = "/run/dovecot2";
   passwdFile = "${passwdDir}/passwd";
   userdbFile = "${passwdDir}/userdb";
@@ -439,13 +442,11 @@ in
       '';
     };
 
-    systemd.services.dovecot2 = {
+    systemd.services.${dovecotUnitName}.preStart =
-      preStart =
+      ''
-        ''
+        ${genPasswdScript}
-          ${genPasswdScript}
+      ''
-        ''
+      + (lib.optionalString cfg.ldap.enable setPwdInLdapConfFile);
-        + (lib.optionalString cfg.ldap.enable setPwdInLdapConfFile);
-    };
 
     systemd.services.postfix.restartTriggers = [
       genPasswdScript