Put imports in config

This commit is contained in:
2023-09-24 10:12:42 -07:00
parent 765792dc54
commit b08c13d6aa
+16 -26
View File
@@ -202,10 +202,9 @@ in {
};
nixos = {
useSystemd = true;
configuration = [
(import ./postfix.nix)
(import ./dovecot.nix)
{
configuration = {
imports = [ ./dovecot.nix ./postfix.nix ];
boot.tmpOnTmpfs = true;
system.nssModules = lib.mkForce [ ];
@@ -247,8 +246,7 @@ in {
};
ldap-conf = "/run/dovecot2/conf.d/ldap.conf";
};
}
];
};
};
};
imap = {
@@ -264,9 +262,8 @@ in {
};
nixos = {
useSystemd = true;
configuration = [
(import ./dovecot.nix)
{
configuration = {
imports = [ ./dovecot.nix ];
boot.tmpOnTmpfs = true;
system.nssModules = lib.mkForce [ ];
fudo.mail.dovecot = {
@@ -291,8 +288,7 @@ in {
};
ldap-conf = "/run/dovecot2/conf.d/ldap.conf";
};
}
];
};
};
};
ldap-proxy.service = mkIf (cfg.ldap-proxy != null) {
@@ -315,9 +311,8 @@ in {
};
nixos = {
useSystemd = true;
configuration = [
(import ./rspamd.nix)
{
configuration = {
imports = [ ./rspamd.nix ];
boot.tmpOnTmpfs = true;
system.nssModules = lib.mkForce [ ];
fudo.mail.rspamd = {
@@ -332,8 +327,7 @@ in {
port = antivirusPort;
};
};
}
];
};
};
};
antivirus = {
@@ -348,9 +342,8 @@ in {
};
nixos = {
useSystemd = true;
configuration = [
(import ./clamav.nix)
{
configuration = {
imports = [ ./clamav.nix ];
boot.tmpOnTmpfs = true;
system.nssModules = lib.mkForce [ ];
fudo.mail.clamav = {
@@ -358,8 +351,7 @@ in {
state-directory = "/state";
port = antispamPort;
};
}
];
};
};
};
dkim = {
@@ -370,9 +362,8 @@ in {
};
nixos = {
useSystemd = true;
configuration = [
(import ./dkim.nix)
{
configuration = {
imports = [ ./dkim.nix ];
boot.tmpOnTmpfs = true;
system.nssModules = lib.mkForce [ ];
fudo.mail.dkim = {
@@ -382,8 +373,7 @@ in {
};
port = dkimPort;
state-directory = "/state";
}
];
};
};
};
metrics-proxy = {