From a8886e9e2fcd85cb61054d7bda9327bc9075df26 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 24 Jul 2024 10:37:19 +0200 Subject: [PATCH] Python Inventory classes: Auto-update --- clanModules/borgbackup/default.nix | 2 +- clanModules/root-password/default.nix | 2 +- clanModules/user-password/default.nix | 2 +- pkgs/clan-cli/clan_cli/inventory/classes.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/clanModules/borgbackup/default.nix b/clanModules/borgbackup/default.nix index 9d32e8d37..760e1afe8 100644 --- a/clanModules/borgbackup/default.nix +++ b/clanModules/borgbackup/default.nix @@ -109,7 +109,7 @@ in options.clan.borgbackup.exclude = lib.mkOption { type = lib.types.listOf lib.types.str; example = [ "*.pyc" ]; - default = []; + default = [ ]; description = '' Directories/Files to exclude from the backup. Use * as a wildcard. diff --git a/clanModules/root-password/default.nix b/clanModules/root-password/default.nix index 7d7a7195e..a340730e3 100644 --- a/clanModules/root-password/default.nix +++ b/clanModules/root-password/default.nix @@ -10,7 +10,7 @@ config.clan.core.facts.services.root-password.secret.password-hash.path; sops.secrets = lib.mkIf (config.clan.core.facts.secretStore == "sops") { - "${config.clan.core.machineName}-password-hash".neededForUsers = true; + "${config.clan.core.machineName}-password-hash".neededForUsers = true; }; clan.core.facts.services.root-password = { diff --git a/clanModules/user-password/default.nix b/clanModules/user-password/default.nix index 9f2643a2e..14b1f0177 100644 --- a/clanModules/user-password/default.nix +++ b/clanModules/user-password/default.nix @@ -25,7 +25,7 @@ config.clan.core.facts.services.user-password.secret.user-password-hash.path; sops.secrets = lib.mkIf (config.clan.core.facts.secretStore == "sops") { - "${config.clan.core.machineName}-user-password-hash".neededForUsers = true; + "${config.clan.core.machineName}-user-password-hash".neededForUsers = true; }; clan.core.facts.services.user-password = { diff --git a/pkgs/clan-cli/clan_cli/inventory/classes.py b/pkgs/clan-cli/clan_cli/inventory/classes.py index 7712932a3..41d116831 100644 --- a/pkgs/clan-cli/clan_cli/inventory/classes.py +++ b/pkgs/clan-cli/clan_cli/inventory/classes.py @@ -39,6 +39,7 @@ class BorgbackupConfigDestination: @dataclass class BorgbackupConfig: destinations: dict[str, BorgbackupConfigDestination] = field(default_factory = dict) + exclude: list[str] = field(default_factory = list) @dataclass