ForkMaster/nixos-mailserver
1
0
Fork 0
mirror of https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git synced 2025-03-31 07:59:52 +05:00
Code Issues Packages Projects Releases Wiki Activity

responding to review feedback

Browse Source
This commit is contained in:
Jeremy Fleischman 2024-11-30 16:53:21 -06:00
parent 909681c13a
commit 5468858a77
No known key found for this signature in database
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -804,7 +804,7 @@ in
Paths to opendkim private keys generated with `opendkim-genkey`,
indexed by domain name.
If `null`, then the keys are auto generated.
If not `null`, then there must be an entry for every domain in
If set, then there must be an entry for every domain in
{option}`config.mailserver.domains`.
>>> TODO: explain/assert how this interacts with `dkimKeyBits`. would

8
mail-server/opendkim.nix
View File

@ -27,13 +27,11 @@ let
let
dkim_key = "${cfg.dkimKeyDirectory}/${dom}.${cfg.dkimSelector}.key";
dkim_txt = "${cfg.dkimKeyDirectory}/${dom}.${cfg.dkimSelector}.txt";
dkimPrivateKeyFile = cfg.dkimPrivateKeyFiles.${dom};
in
if cfg.dkimPrivateKeyFiles != null then
let
dkimPrivateKeyFile = cfg.dkimPrivateKeyFiles.${dom};
in
''
if [ ! -f "${dkimPrivateKeyFile}" ]; then
if [ ! -e "${dkimPrivateKeyFile}" ]; then
echo "DKIM keyfile does not exist: ${dkimPrivateKeyFile}"
exit 1
fi
@ -42,7 +40,7 @@ let
''
else
''
if [ ! -f "${dkim_key}" ]; then
if [ ! -e "${dkim_key}" ]; then
${pkgs.opendkim}/bin/opendkim-genkey -s "${cfg.dkimSelector}" \
-d "${dom}" \
--bits="${toString cfg.dkimKeyBits}" \