Merge branch 'v2.1-bugfixes'

mail-server/postfix.nix

@@ -125,7 +125,7 @@ in
         smtpd_relay_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
 
         # quota
-        smtpd_recipient_restrictions = check_policy_service inet:mailstore.example.com:12340
+        smtpd_recipient_restrictions = check_policy_service inet:localhost:12340
 
         # TLS settings, inspired by https://github.com/jeaye/nix-files
         # Submission by mail clients is handled in submissionOptions

mail-server/systemd.nix

@@ -41,9 +41,13 @@ let
   createDhParameterFile =
     ''
       # Create a dh parameter file
-      ${pkgs.openssl}/bin/openssl \
-            dhparam ${builtins.toString cfg.dhParamBitLength} \
-            > "${cfg.certificateDirectory}/dh.pem"
+      if [ ! -f "''${cfg.certificateDirectory}/dh.pem" ]
+      then
+          mkdir -p "${cfg.certificateDirectory}"
+          ${pkgs.openssl}/bin/openssl \
+                dhparam ${builtins.toString cfg.dhParamBitLength} \
+                > "${cfg.certificateDirectory}/dh.pem"
+      fi
     '';
 
   createDomainDkimCert = dom: