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

refactor(email-options): rename selfprivacy.email.subdomain to domain

Browse Source
This commit is contained in:
Thary
2025-09-16 17:11:03 +03:00
parent d843c14ffd
commit 544c9b81b4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
selfprivacy-module.nix
View File

@@ -193,13 +193,13 @@ with lib;
email = with lib; mkOption { email = with lib; mkOption {
type = types.attrsOf ( type = types.attrsOf (
types.submodule ( types.submodule (
{ name, ... }: { { ... }: {
options = { options = {
subdomain = mkOption { domain = 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 = "myservice.example.net";
default = config.sp.domain; default = config.sp.domain;
description = "Email subdomain"; description = "Domain 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.subdomain) sp.email; extraDomains = lib.mapAttrsToList (_: value: value.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 (