Skynet/misc_nixos-mailserver
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'v2.1-bugfixes'

Browse source
This commit is contained in:
Robin Raymond 2018-02-23 14:57:22 +01:00
commit 22caa012d6
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mail-server/postfix.nix
View file

@ -125,7 +125,7 @@ in
smtpd_relay_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination smtpd_relay_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
# quota # quota
smtpd_recipient_restrictions = check_policy_service inet:mailstore.example.com:12340 smtpd_recipient_restrictions = check_policy_service inet:localhost:12340
# TLS settings, inspired by https://github.com/jeaye/nix-files # TLS settings, inspired by https://github.com/jeaye/nix-files
# Submission by mail clients is handled in submissionOptions # Submission by mail clients is handled in submissionOptions

4
mail-server/systemd.nix
View file

@ -41,9 +41,13 @@ let
createDhParameterFile = createDhParameterFile =
'' ''
# Create a dh parameter file # Create a dh parameter file
if [ ! -f "''${cfg.certificateDirectory}/dh.pem" ]
then
mkdir -p "${cfg.certificateDirectory}"
${pkgs.openssl}/bin/openssl \ ${pkgs.openssl}/bin/openssl \
dhparam ${builtins.toString cfg.dhParamBitLength} \ dhparam ${builtins.toString cfg.dhParamBitLength} \
> "${cfg.certificateDirectory}/dh.pem" > "${cfg.certificateDirectory}/dh.pem"
fi
''; '';
createDomainDkimCert = dom: createDomainDkimCert = dom: