Put imports in config

This commit is contained in:
niten 2023-09-24 10:12:42 -07:00
parent 765792dc54
commit b08c13d6aa

View File

@ -202,10 +202,9 @@ in {
}; };
nixos = { nixos = {
useSystemd = true; useSystemd = true;
configuration = [ configuration = {
(import ./postfix.nix) imports = [ ./dovecot.nix ./postfix.nix ];
(import ./dovecot.nix)
{
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
system.nssModules = lib.mkForce [ ]; system.nssModules = lib.mkForce [ ];
@ -247,8 +246,7 @@ in {
}; };
ldap-conf = "/run/dovecot2/conf.d/ldap.conf"; ldap-conf = "/run/dovecot2/conf.d/ldap.conf";
}; };
} };
];
}; };
}; };
imap = { imap = {
@ -264,9 +262,8 @@ in {
}; };
nixos = { nixos = {
useSystemd = true; useSystemd = true;
configuration = [ configuration = {
(import ./dovecot.nix) imports = [ ./dovecot.nix ];
{
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
system.nssModules = lib.mkForce [ ]; system.nssModules = lib.mkForce [ ];
fudo.mail.dovecot = { fudo.mail.dovecot = {
@ -291,8 +288,7 @@ in {
}; };
ldap-conf = "/run/dovecot2/conf.d/ldap.conf"; ldap-conf = "/run/dovecot2/conf.d/ldap.conf";
}; };
} };
];
}; };
}; };
ldap-proxy.service = mkIf (cfg.ldap-proxy != null) { ldap-proxy.service = mkIf (cfg.ldap-proxy != null) {
@ -315,9 +311,8 @@ in {
}; };
nixos = { nixos = {
useSystemd = true; useSystemd = true;
configuration = [ configuration = {
(import ./rspamd.nix) imports = [ ./rspamd.nix ];
{
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
system.nssModules = lib.mkForce [ ]; system.nssModules = lib.mkForce [ ];
fudo.mail.rspamd = { fudo.mail.rspamd = {
@ -332,8 +327,7 @@ in {
port = antivirusPort; port = antivirusPort;
}; };
}; };
} };
];
}; };
}; };
antivirus = { antivirus = {
@ -348,9 +342,8 @@ in {
}; };
nixos = { nixos = {
useSystemd = true; useSystemd = true;
configuration = [ configuration = {
(import ./clamav.nix) imports = [ ./clamav.nix ];
{
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
system.nssModules = lib.mkForce [ ]; system.nssModules = lib.mkForce [ ];
fudo.mail.clamav = { fudo.mail.clamav = {
@ -358,8 +351,7 @@ in {
state-directory = "/state"; state-directory = "/state";
port = antispamPort; port = antispamPort;
}; };
} };
];
}; };
}; };
dkim = { dkim = {
@ -370,9 +362,8 @@ in {
}; };
nixos = { nixos = {
useSystemd = true; useSystemd = true;
configuration = [ configuration = {
(import ./dkim.nix) imports = [ ./dkim.nix ];
{
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
system.nssModules = lib.mkForce [ ]; system.nssModules = lib.mkForce [ ];
fudo.mail.dkim = { fudo.mail.dkim = {
@ -382,8 +373,7 @@ in {
}; };
port = dkimPort; port = dkimPort;
state-directory = "/state"; state-directory = "/state";
} };
];
}; };
}; };
metrics-proxy = { metrics-proxy = {