From 87e85c370bd6236a834f95e6cbe4818a7dffc316 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Sat, 14 Jun 2025 19:42:29 +0300 Subject: [PATCH] Update lindberg-webapps configurations --- defaults/meta/hosts.json | 2 +- flake.lock | 9 +++++---- nixos-configurations/lindberg-webapps/disko-config.nix | 2 +- packages/sops-config/default.nix | 2 +- private | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/defaults/meta/hosts.json b/defaults/meta/hosts.json index 39d478d..37532af 100644 --- a/defaults/meta/hosts.json +++ b/defaults/meta/hosts.json @@ -17,7 +17,7 @@ }, "lindberg-webapps": { "hostName": "lindberg-webapps", - "sshKey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJT99lj5OI+V1PlZl/T2ikBORwMiXjDfWpHYfq/GvUM5" + "sshKey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByESy+XiBT8/PoE8DUB388B5MA6LVcJBgH1ZgYxr9Mg" }, "batzberg": { "hostName": "batzberg" diff --git a/flake.lock b/flake.lock index 7454489..1fee195 100644 --- a/flake.lock +++ b/flake.lock @@ -170,10 +170,11 @@ ] }, "locked": { - "lastModified": 1747599024, - "narHash": "sha256-qc94Cyt6uaQCVY2VlCtNxGb7hs3DbLvxuhEnSLFL8T8=", - "rev": "bed7588246ec58aacac3d0ff5b191fa6cc9faa98", - "revCount": 17, + "lastModified": 1749920008, + "narHash": "sha256-wn3U2q/+OQYErVyoY9kwZP/fXcDG4ewhJkHX7qHzq8g=", + "ref": "refs/heads/main", + "rev": "5f8ba2025848dd30539c42ef1f7e6c6f917e70d9", + "revCount": 19, "type": "git", "url": "file:./private" }, diff --git a/nixos-configurations/lindberg-webapps/disko-config.nix b/nixos-configurations/lindberg-webapps/disko-config.nix index 8a7d268..6024053 100644 --- a/nixos-configurations/lindberg-webapps/disko-config.nix +++ b/nixos-configurations/lindberg-webapps/disko-config.nix @@ -3,7 +3,7 @@ disko.devices.disk = { system = { type = "disk"; - device = "/dev/vda"; + device = "/dev/vdb"; content = { type = "gpt"; partitions = { diff --git a/packages/sops-config/default.nix b/packages/sops-config/default.nix index 9655950..74e5c79 100644 --- a/packages/sops-config/default.nix +++ b/packages/sops-config/default.nix @@ -75,7 +75,7 @@ writeText ".sops.yaml" ( # Secrets for all hosts { - path_regex = "private/nixos-configurations/secrets\.sops\.(yaml|json|env|ini)$"; + path_regex = "private/nixos-modules/shared-secrets/default\.sops\.(yaml|json|env|ini)$"; pgp = toCommaList userPgpKeys; age = toCommaList (userAgeKeys ++ builtins.attrValues serverAgeKeys); } diff --git a/private b/private index bed7588..5f8ba20 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit bed7588246ec58aacac3d0ff5b191fa6cc9faa98 +Subproject commit 5f8ba2025848dd30539c42ef1f7e6c6f917e70d9