From c4e3b755cec274d081b0dc83f28222b2c40e0d6e Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Sun, 31 May 2026 09:06:26 +0200 Subject: [PATCH] Changed Overlays --- nixos/packages/oidcwarden.nix | 5 +++-- nixos/packages/overlays.nix | 4 +++- nixos/roles/monitoring.nix | 8 +++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/nixos/packages/oidcwarden.nix b/nixos/packages/oidcwarden.nix index 73bd9ea..f35704d 100644 --- a/nixos/packages/oidcwarden.nix +++ b/nixos/packages/oidcwarden.nix @@ -15,8 +15,9 @@ in vaultwarden.overrideAttrs (old: { pname = "oidcwarden"; inherit src; - cargoDeps = rustPlatform.importCargoLock { - lockFile = "${src}/Cargo.lock"; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = "sha256-eGsYNaLYRCrTRaoyfhxnoeA2ytYeyGGvHnAbpEIayzs="; }; postInstall = (old.postInstall or "") + '' mv $out/bin/oidcwarden $out/bin/vaultwarden diff --git a/nixos/packages/overlays.nix b/nixos/packages/overlays.nix index d0bfe58..929dc71 100644 --- a/nixos/packages/overlays.nix +++ b/nixos/packages/overlays.nix @@ -1,4 +1,6 @@ final: prev: { gs1200-exporter = final.callPackage ./gs1200-exporter.nix { }; - oidcwarden = final.callPackage ./oidcwarden.nix { inherit (prev) vaultwarden; }; + oidcwarden = final.callPackage ./oidcwarden.nix { + inherit (prev) vaultwarden; + }; } diff --git a/nixos/roles/monitoring.nix b/nixos/roles/monitoring.nix index 2f24a38..e1ce3c6 100644 --- a/nixos/roles/monitoring.nix +++ b/nixos/roles/monitoring.nix @@ -62,7 +62,7 @@ in }; settings = { server = { - domain = "www.cyperpunk.de"; # serverIP; # "grafana.cyperpunk.de"; + domain = "www.cyperpunk.de"; http_port = 2342; http_addr = "0.0.0.0"; root_url = "https://www.cyperpunk.de/grafana/"; @@ -71,6 +71,8 @@ in security = { secret_key = "$__file{${config.sops.secrets.grafana_secret_key.path}}"; allow_embedding = true; + cookie_samesite = "none"; + cookie_secure = true; }; auth = { disable_login_form = false; @@ -92,6 +94,10 @@ in auto_assign_org_role = "Admin"; skip_org_role_sync = true; }; + "auth.anonymous" = { + enabled = true; + org_role = "Viewer"; + }; }; };