Merge branch 'pr/misc-fix' into 'master'
a few fixes See merge request simple-nixos-mailserver/nixos-mailserver!497
This commit is contained in:
+5
-1
@@ -997,7 +997,7 @@ in
|
||||
DKIM selectors used for signing outgoing mail for this domain.
|
||||
|
||||
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 (
|
||||
types.submodule ({
|
||||
@@ -1601,5 +1601,9 @@ in
|
||||
[ "mailserver" "dkim" "defaults" "selector" ]
|
||||
)
|
||||
(mkRenamedOptionModule [ "mailserver" "dkimKeyType" ] [ "mailserver" "dkim" "defaults" "keyType" ])
|
||||
(mkRenamedOptionModule
|
||||
[ "mailserver" "dkimKeyBits" ]
|
||||
[ "mailserver" "dkim" "defaults" "keyLength" ]
|
||||
)
|
||||
];
|
||||
}
|
||||
|
||||
@@ -231,7 +231,7 @@ your record below.
|
||||
:header: "Name", "TTL", "Type", "Value"
|
||||
: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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user