Merge branch 'remove-dovecot-service-name-workaround' into 'master'

Remove dovecot service name compat code

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

mail-server/common.nix

@@ -16,7 +16,6 @@
 
 {
   config,
-  options,
   pkgs,
   lib,
 }:
@@ -87,6 +86,4 @@ in
       chmod 600 ${destination}
     '';
 
-  dovecotUnitName = if options.services.dovecot2 ? hasNewUnitName then "dovecot" else "dovecot2";
-
 }

mail-server/dovecot.nix

@@ -450,7 +450,7 @@ in
       '';
     };
 
-    systemd.services.${dovecotUnitName} = {
+    systemd.services.dovecot = {
       preStart = ''
         ${genPasswdScript}
       ''

mail-server/nginx.nix

@@ -52,7 +52,7 @@ in
           extraDomainNames = lib.mkIf (cfg.certificateScheme == "acme") cfg.certificateDomains;
           reloadServices = [
             "postfix.service"
-            "${dovecotUnitName}.service"
+            "dovecot.service"
           ];
         };
       };

mail-server/systemd.nix

@@ -71,7 +71,7 @@ in
         };
 
     # Create maildir folder before dovecot startup
-    systemd.services.${dovecotUnitName} = {
+    systemd.services.dovecot = {
       wants = certificatesDeps;
       after = certificatesDeps;
       preStart =
@@ -95,11 +95,11 @@ in
     systemd.services.postfix = {
       wants = certificatesDeps;
       after = [
-        "${dovecotUnitName}.service"
+        "dovecot.service"
       ]
       ++ lib.optional cfg.dkimSigning "rspamd.service"
       ++ certificatesDeps;
-      requires = [ "${dovecotUnitName}.service" ] ++ lib.optional cfg.dkimSigning "rspamd.service";
+      requires = [ "dovecot.service" ] ++ lib.optional cfg.dkimSigning "rspamd.service";
     };
   };
 }

mail-server/users.nix

@@ -117,7 +117,7 @@ in
 
     systemd.services.activate-virtual-mail-users = {
       wantedBy = [ "multi-user.target" ];
-      before = [ "${dovecotUnitName}.service" ];
+      before = [ "dovecot.service" ];
       serviceConfig = {
         ExecStart = virtualMailUsersActivationScript;
       };