public
/
mail-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap IPv6 in []

This commit is contained in:
niten 2023-10-14 23:30:06 -07:00
parent 34b51d34b9
commit 784ac3500d
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mail-server.nix
View File

@ -306,7 +306,14 @@ in {
domain = cfg.primary-domain; domain = cfg.primary-domain;
local-domains = cfg.extra-domains; local-domains = cfg.extra-domains;
hostname = cfg.smtp.hostname; hostname = cfg.smtp.hostname;
trusted-networks = cfg.trusted-networks; trusted-networks = let
isIpv6 = net: !isNull (builtins.match ":" net);
addIpv6Escape = net:
let components = builtins.split "/" net;
in "[${elemAt components 0}]/${elemAt components 1}";
escapeIpv6 = net:
if isIpv6 net then addIpv6Escape net else net;
in map escapeIpv6 cfg.trusted-networks;
blacklist = { blacklist = {
senders = cfg.blacklist.senders; senders = cfg.blacklist.senders;
recipients = cfg.blacklist.recipients; recipients = cfg.blacklist.recipients;
@ -403,6 +410,13 @@ in {
]; ];
env_file = [ hostSecrets.mailLdapProxyEnv.target-file ]; env_file = [ hostSecrets.mailLdapProxyEnv.target-file ];
}; };
solr.service = {
image = cfg.images.solr;
restart = "always";
networks = [ "solr_network" ];
volumes = [ "${cfg.state-directory}/solr:/var/solr" ];
#user = "${toString config.users.users.mail-server-solr.uid}:8983";
};
antispam = { antispam = {
service = { service = {
networks = [ networks = [