wurzel/fruitbasket
10
1
Fork 1
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #67 from fsr/domain-refactor

Browse source 
Remove fsr domain option and use the native networking ones
This commit is contained in:
Rouven Seifert 2023-09-17 20:31:03 +02:00 • committed by GitHub
commit 3c98566664
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 54 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/mail/default.nix
View file

@ -1,8 +1,8 @@
{ config, pkgs, lib, ... }:
{ config, pkgs, ... }:
let
hostname = "mail.${config.fsr.domain}";
domain = config.fsr.domain;
rspamd-domain = "rspamd.${config.fsr.domain}";
hostname = "mail.${config.networking.domain}";
domain = config.networking.domain;
rspamd-domain = "rspamd.${config.networking.domain}";
dovecot-ldap-args = pkgs.writeText "ldap-args" ''
uris = ldap://localhost
dn = uid=search, ou=users, dc=ifsr, dc=de
@ -84,8 +84,7 @@ in
config = {
home_mailbox = "Maildir/";
# hostname used in helo command. It is recommended to have this match the reverse dns entry
# smtp_helo_name = "x8d1e1ea9.agdsn.tu-dresden.de";
smtp_helo_name = config.networking.rdns;
smtp_helo_name = config.networking.rDNS;
smtp_use_tls = true;
# smtp_tls_security_level = "encrypt";
smtpd_use_tls = true;
@ -239,7 +238,7 @@ in
};
opendkim = {
enable = true;
domains = "csl:${config.fsr.domain}";
domains = "csl:${config.networking.domain}";
selector = config.networking.hostName;
configFile = pkgs.writeText "opendkim-config" ''
UMask 0117