danvics/selfhostblocks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

mailserver: separate backup for dkim as it uses other user

Browse source
This commit is contained in:
ibizaman 2026-01-25 11:43:02 +01:00 committed by Pierre Penninckx
parent aeebb4d34b
commit a1b8fc758a
2 changed files with 54 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
docs/redirects.json
View file

@ -4055,6 +4055,39 @@
"services-mailserver-options-shb.mailserver.backup.result.restoreScript": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backup.result.restoreScript"
],
"services-mailserver-options-shb.mailserver.backupDKIM": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM"
],
"services-mailserver-options-shb.mailserver.backupDKIM.request": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM.request"
],
"services-mailserver-options-shb.mailserver.backupDKIM.request.excludePatterns": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM.request.excludePatterns"
],
"services-mailserver-options-shb.mailserver.backupDKIM.request.hooks": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM.request.hooks"
],
"services-mailserver-options-shb.mailserver.backupDKIM.request.hooks.afterBackup": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM.request.hooks.afterBackup"
],
"services-mailserver-options-shb.mailserver.backupDKIM.request.hooks.beforeBackup": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM.request.hooks.beforeBackup"
],
"services-mailserver-options-shb.mailserver.backupDKIM.request.sourceDirectories": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM.request.sourceDirectories"
],
"services-mailserver-options-shb.mailserver.backupDKIM.request.user": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM.request.user"
],
"services-mailserver-options-shb.mailserver.backupDKIM.result": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM.result"
],
"services-mailserver-options-shb.mailserver.backupDKIM.result.backupService": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM.result.backupService"
],
"services-mailserver-options-shb.mailserver.backupDKIM.result.restoreScript": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.backupDKIM.result.restoreScript"
],
"services-mailserver-options-shb.mailserver.domain": [
"services-mailserver.html#services-mailserver-options-shb.mailserver.domain"
],

23
modules/services/mailserver.nix
View file

@ -335,7 +335,7 @@ in
backup = lib.mkOption {
description = ''
Backup emails.
Backup emails, index and sieve.
'';
default = { };
type = lib.types.submodule {
@ -345,13 +345,32 @@ in
config.mailserver.indexDir
config.mailserver.mailDirectory
config.mailserver.sieveDirectory
config.mailserver.dkimKeyDirectory
];
sourceDirectoriesText = ''
[
config.mailserver.indexDir
config.mailserver.mailDirectory
config.mailserver.sieveDirectory
]
'';
};
};
};
backupDKIM = lib.mkOption {
description = ''
Backup dkim directory.
'';
default = { };
type = lib.types.submodule {
options = shb.contracts.backup.mkRequester {
user = config.services.rspamd.user;
userText = "services.rspamd.user";
sourceDirectories = builtins.filter (x: x != null) [
config.mailserver.dkimKeyDirectory
];
sourceDirectoriesText = ''
[
config.mailserver.dkimKeyDirectory
]
'';