thary/sp-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(email-options): selfprivacy.email.domain -> subdomain

Browse Source
This commit is contained in:
Thary
2025-09-16 19:08:15 +03:00
parent 544c9b81b4
commit c615322c4e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
selfprivacy-module.nix
View File

@@ -195,11 +195,11 @@ with lib;
types.submodule ( types.submodule (
{ ... }: { { ... }: {
options = { options = {
domain = mkOption { subdomain = mkOption {
type = with types; strMatching "[A-Za-z0-9][A-Za-z0-9\-]{0,61}[A-Za-z0-9]"; type = with types; strMatching "[A-Za-z0-9][A-Za-z0-9\-]{0,61}[A-Za-z0-9]";
example = "myservice.example.net"; example = "myservice";
default = config.sp.domain; default = config.sp.domain;
description = "Domain to send emails from"; description = "Subdomain to send emails from";
}; };
systemdTargets = mkOption { systemdTargets = mkOption {

2
sp-modules/simple-nixos-mailserver/config.nix
View File

@@ -23,7 +23,7 @@ let
inherit (value) hashedPasswordFile sendOnly; inherit (value) hashedPasswordFile sendOnly;
} }
) sp.email; ) sp.email;
extraDomains = lib.mapAttrsToList (_: value: value.domain) sp.email; extraDomains = lib.mapAttrsToList (_: value: "${value.subdomain}.${sp.domain}") sp.email;
extraTargets = lib.mapAttrsToList (_: value: value.systemdTargets) sp.email; extraTargets = lib.mapAttrsToList (_: value: value.systemdTargets) sp.email;
in in
lib.mkIf sp.modules.simple-nixos-mailserver.enable ( lib.mkIf sp.modules.simple-nixos-mailserver.enable (