complete module rewrite

default.nix

@@ -253,15 +253,8 @@ in
     ./mail-server/environment.nix
     ./mail-server/networking.nix
     ./mail-server/systemd.nix
+    ./mail-server/dovecot.nix
+    ./mail-server/postfix.nix
+    ./mail-server/rmilter.nix
   ];
-
-  config = mkIf cfg.enable {
-    services = import ./mail-server/services.nix {
-      inherit lib;
-      inherit (cfg) mailDirectory vmailUserName vmailGroupName virtualAliases domain
-              enableImap enablePop3 dkimSigning dkimSelector dkimKeyDirectory
-              certificateScheme certificateFile keyFile certificateDirectory virusScanning;
-    };
-
-  };
 }

mail-server/dovecot.nix

@@ -14,23 +14,28 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ vmailGroupName, vmailUserName, mailDirectory, enableImap, enablePop3, cert,
+{ config, pkgs, lib, ... }:
-key }:
+
+with (import ./common.nix { inherit config; });
 
 let
+  cfg = config.mailserver;
+
   # maildir in format "/${domain}/${user}/"
-  dovecot_maildir = "maildir:${mailDirectory}/%d/%n/";
+  dovecot_maildir = "maildir:${cfg.mailDirectory}/%d/%n/";
 
 in
 {
+  config = with cfg; lib.mkIf enable {
+    services.dovecot2 = {
       enable = true;
       enableImap = enableImap;
       enablePop3 = enablePop3;
       mailGroup = vmailGroupName;
       mailUser = vmailUserName;
       mailLocation = dovecot_maildir;
-  sslServerCert = cert;
+      sslServerCert = certificatePath;
-  sslServerKey = key;
+      sslServerKey = keyPath;
       enableLmtp = true;
       extraConfig = ''
         #Extra Config
@@ -83,4 +88,6 @@ in
         }
         }
       '';
+    };
+  };
 }

mail-server/postfix.nix

@@ -14,21 +14,25 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ lib, mailDirectory, domain, virtualAliases, cert, key }:
+{ config, pkgs, lib, ... }:
+
+with (import ./common.nix { inherit config; });
 
 let
+  cfg = config.mailserver;
+
   # valiases_postfix :: [ String ]
   valiases_postfix = map
     (from:
-      let to = virtualAliases.${from};
+      let to = cfg.virtualAliases.${from};
-      in "${from}@${domain} ${to}@${domain}")
+      in "${from}@${cfg.domain} ${to}@${cfg.domain}")
-    (builtins.attrNames virtualAliases);
+    (builtins.attrNames cfg.virtualAliases);
 
   # valiases_file :: Path
   valiases_file = builtins.toFile "valias" (lib.concatStringsSep "\n" valiases_postfix);
 
   # vhosts_file :: Path
-  vhosts_file = builtins.toFile "vhosts" domain;
+  vhosts_file = builtins.toFile "vhosts" cfg.domain;
 
   # vaccounts_file :: Path
   # see
@@ -39,17 +43,19 @@ let
 
 in
 {
+  config = with cfg; lib.mkIf enable {
+
+    services.postfix = {
       enable = true;
       networksStyle = "host";
       mapFiles."valias" = valiases_file;
       mapFiles."vaccounts" = vaccounts_file; 
-  sslCert = cert;
+      sslCert = certificatePath;
-  sslKey = key;
+      sslKey = keyPath;
       enableSubmission = true;
 
       extraConfig = 
       ''
-
       # Extra Config
 
         smtpd_banner = $myhostname ESMTP NO UCE
@@ -85,4 +91,6 @@ in
         smtpd_sender_restrictions = "reject_sender_login_mismatch";
         smtpd_recipient_restrictions = "reject_non_fqdn_recipient,reject_unknown_recipient_domain,permit_sasl_authenticated,reject";
       };
+    };
+  };
 }

mail-server/rmilter.nix

@@ -14,10 +14,12 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ domain, virusScanning, dkimSigning, dkimKeyDirectory, dkimSelector }:
+{ config, pkgs, lib, ... }:
 
 let
-  clamav = if virusScanning
+  cfg = config.mailserver;
+
+  clamav = if cfg.virusScanning
            then
            ''
              clamav {
@@ -25,14 +27,14 @@ let
              };
            ''
            else "";
-  dkim = if dkimSigning
+  dkim = if cfg.dkimSigning
          then
          ''
             dkim {
               domain {
-                key = "${dkimKeyDirectory}";
+                key = "${cfg.dkimKeyDirectory}";
                 domain = "*";
-                selector = "${dkimSelector}";
+                selector = "${cfg.dkimSelector}";
               };
               sign_alg = sha256;
               auth_only = yes;
@@ -41,15 +43,17 @@ let
          else "";
 in
 {
-  enable = true;
+  config = with cfg; lib.mkIf enable {
-  # debug = true;
+    services.rmilter.enable = true;
-  postfix.enable = true;
+    # services.rmilter.debug = true;
-  rspamd.enable = true;
+    services.rmilter.postfix.enable = true;
-  extraConfig =
+    services.rmilter.rspamd.enable = true;
+    services.rmilter.extraConfig =
     ''
     ${clamav}
 
     ${dkim}
     '';
+  };
 }
 

mail-server/services.nix

@@ -14,42 +14,31 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ lib, mailDirectory, vmailUserName, vmailGroupName, virtualAliases, domain,
+
-enableImap, enablePop3, virusScanning, dkimSigning, dkimSelector,
+{ config, pkgs, lib, ... }:
-dkimKeyDirectory, certificateScheme, certificateFile, keyFile,
-certificateDirectory }:
 
 let
+  cfg = config.mailserver;
+
   # cert :: PATH
-  cert = if certificateScheme == 1
+  cert = if cfg.certificateScheme == 1
-         then certificateFile
+         then cfg.certificateFile
-         else if certificateScheme == 2
+         else if cfg.certificateScheme == 2
-              then "${certificateDirectory}/cert-${domain}.pem"
+              then "${cfg.certificateDirectory}/cert-${cfg.domain}.pem"
               else "";
 
   # key :: PATH
-  key = if certificateScheme == 1
+  key = if cfg.certificateScheme == 1
-        then keyFile
+        then cfg.keyFile
-        else if certificateScheme == 2
+        else if cfg.certificateScheme == 2
-             then "${certificateDirectory}/key-${domain}.pem"
+             then "${cfg.certificateDirectory}/key-${cfg.domain}.pem"
              else "";
 in
 {
-  # rspamd
-  rspamd = {
-    enable = true;
-  };
   
-  rmilter = import ./rmilter.nix {
+  imports = [
-    inherit domain virusScanning dkimSigning dkimSelector dkimKeyDirectory;
+    ./rmilter.nix
-  };
+    ./postfix.nix key
-
+    ./dovecot.nix
-  postfix = import ./postfix.nix {
+  ];
-    inherit lib mailDirectory domain virtualAliases cert key;
-  };
-
-  dovecot2 = import ./dovecot.nix {
-    inherit vmailGroupName vmailUserName mailDirectory enableImap
-            enablePop3 cert key;
-  };
 }