Merge pull request 'Set networking.hostName to clanCore.machineName' (#1140) from networkd into main
This commit is contained in:
commit
5dac575be8
|
@ -58,6 +58,7 @@ let
|
|||
(machines.${name} or { })
|
||||
(
|
||||
{
|
||||
networking.hostName = lib.mkDefault name;
|
||||
clanCore.clanName = clanName;
|
||||
clanCore.clanIcon = clanIcon;
|
||||
clanCore.clanDir = directory;
|
||||
|
|
|
@ -46,7 +46,7 @@ in
|
|||
clanCore.facts.secretModule = "clan_cli.facts.secret_modules.sops";
|
||||
clanCore.facts.secretUploadDirectory = lib.mkDefault "/var/lib/sops-nix";
|
||||
sops.secrets = builtins.mapAttrs (name: _: {
|
||||
name = lib.strings.removePrefix "${config.networking.hostName}-" name;
|
||||
name = lib.strings.removePrefix "${config.clanCore.machineName}-" name;
|
||||
sopsFile = config.clanCore.clanDir + "/sops/secrets/${name}/secret";
|
||||
format = "binary";
|
||||
}) secrets;
|
||||
|
|
Loading…
Reference in New Issue
Block a user