aither/simple-nixos-mailserver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'pr/misc-fix' into 'master'

Browse Source 
a few fixes

See merge request simple-nixos-mailserver/nixos-mailserver!497
This commit is contained in:
Martin Weinelt
2026-03-15 00:36:10 +00:00
parent 58587e09bd 6606537c0f
commit 75f9549a81
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
default.nix
+5 -1
View File
@@ -997,7 +997,7 @@ in
DKIM selectors used for signing outgoing mail for this domain. DKIM selectors used for signing outgoing mail for this domain.
When no selector is configured a default selector will be When no selector is configured a default selector will be
created with settings inherited from {option}`mailserver.defaults.dkim <mailserver.dkim.defaults.keyLength>`. created with settings inherited from {option}`mailserver.dkim.defaults <mailserver.dkim.defaults.keyLength>`.
''; '';
type = types.attrsOf ( type = types.attrsOf (
types.submodule ({ types.submodule ({
@@ -1601,5 +1601,9 @@ in
[ "mailserver" "dkim" "defaults" "selector" ] [ "mailserver" "dkim" "defaults" "selector" ]
) )
(mkRenamedOptionModule [ "mailserver" "dkimKeyType" ] [ "mailserver" "dkim" "defaults" "keyType" ]) (mkRenamedOptionModule [ "mailserver" "dkimKeyType" ] [ "mailserver" "dkim" "defaults" "keyType" ])
(mkRenamedOptionModule
[ "mailserver" "dkimKeyBits" ]
[ "mailserver" "dkim" "defaults" "keyLength" ]
)
]; ];
} }
docs/setup-guide.rst
+1 -1
View File
@@ -231,7 +231,7 @@ your record below.
:header: "Name", "TTL", "Type", "Value" :header: "Name", "TTL", "Type", "Value"
:widths: 30, 10, 10, 50 :widths: 30, 10, 10, 50
example.com., 86400, TXT, v=DKIM1; k=rsa; p=MIIBIjANBgk...Q0eBwIDAQAB mail._domainkey.example.com., 86400, TXT, v=DKIM1; k=rsa; p=MIIBIjANBgk...Q0eBwIDAQAB
.. code-block:: console .. code-block:: console