yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'clanModules: fix dyndns porkbun support' (#2674) from Qubasa/clan-core:Qubasa-fix_dyndns_porkbun into main

Browse Source
This commit is contained in:
clan-bot
2024-12-30 18:31:34 +00:00
parent 243e882541 a67beea34a
commit 13b7a37994
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
clanModules/dyndns/default.nix
View File

@@ -12,7 +12,7 @@ let
# We dedup secrets if they have the same provider + base domain # We dedup secrets if they have the same provider + base domain
secret_id = opt: "${name}-${opt.provider}-${opt.domain}"; secret_id = opt: "${name}-${opt.provider}-${opt.domain}";
secret_path = secret_path =
opt: config.clan.core.facts.services."${secret_id opt}".secret."${secret_id opt}".path; opt: config.clan.core.vars.generators."${secret_id opt}".files."${secret_id opt}".path;
# We check that a secret has not been set in extraSettings. # We check that a secret has not been set in extraSettings.
extraSettingsSafe = extraSettingsSafe =
@@ -48,11 +48,12 @@ let
secret_generator = _: opt: { secret_generator = _: opt: {
name = secret_id opt; name = secret_id opt;
value = { value = {
secret.${secret_id opt} = { }; share = true;
generator.prompt = "Dyndns passphrase for ${secret_id opt}"; migrateFact = "${secret_id opt}";
generator.script = '' prompts.${secret_id opt} = {
echo "$prompt_value" > $secrets/${secret_id opt} type = "hidden";
''; createFile = true;
};
}; };
}; };
in in
@@ -102,6 +103,7 @@ in
"password" "password"
"token" "token"
"api_key" "api_key"
"secret_api_key"
]; ];
default = "password"; default = "password";
description = "The field name for the secret"; description = "The field name for the secret";
@@ -131,7 +133,7 @@ in
config = lib.mkMerge [ config = lib.mkMerge [
(lib.mkIf (cfg.settings != { }) { (lib.mkIf (cfg.settings != { }) {
clan.core.facts.services = lib.mapAttrs' secret_generator cfg.settings; clan.core.vars.generators = lib.mapAttrs' secret_generator cfg.settings;
users.groups.${name} = { }; users.groups.${name} = { };
users.users.${name} = { users.users.${name} = {
@@ -197,6 +199,8 @@ in
attrset['password'] = get_credential(attrset['password']) attrset['password'] = get_credential(attrset['password'])
elif "token" in attrset: elif "token" in attrset:
attrset['token'] = get_credential(attrset['token']) attrset['token'] = get_credential(attrset['token'])
elif "secret_api_key" in attrset:
attrset['secret_api_key'] = get_credential(attrset['secret_api_key'])
elif "api_key" in attrset: elif "api_key" in attrset:
attrset['api_key'] = get_credential(attrset['api_key']) attrset['api_key'] = get_credential(attrset['api_key'])
else: else: