From 35988e788856d477781c76fa79e9e592217c3e0e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 15 Apr 2025 10:26:46 +0200 Subject: [PATCH 1/2] feat(coturn): update configuration for secret management Removed comment clutter and streamlined the configuration for better readability and maintenance. Ensured the sops secrets and ACME certificate handling remain functional. --- systems/x86_64-linux/mx/coturn.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/systems/x86_64-linux/mx/coturn.nix b/systems/x86_64-linux/mx/coturn.nix index fd6b792..45fb964 100644 --- a/systems/x86_64-linux/mx/coturn.nix +++ b/systems/x86_64-linux/mx/coturn.nix @@ -1,12 +1,11 @@ -{ - pkgs, - lib, - config, - ... +{ pkgs +, lib +, config +, ... }: { sops.secrets."coturn/static-auth-secret" = { - sopsFile = ../../../.secrets/hetzner/coturn.yaml; # bring your own password file + sopsFile = ../../../.secrets/hetzner/coturn.yaml; restartUnits = [ "coturn.service" ]; owner = "turnserver"; }; @@ -36,7 +35,6 @@ # get a certificate security.acme.certs.${config.services.coturn.realm} = { - # insert here the right configuration to obtain a certificate postRun = "systemctl restart coturn.service"; group = "turnserver"; }; From acdb0851e76637ba4a62fbc57713af8ee9cee6ad Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 15 Apr 2025 12:09:01 +0200 Subject: [PATCH 2/2] fix: update goose-cli to version 1.0.17-2 Updated the goose-cli package version and its related fetch attributes, including source revision and hashes. Added a new test to skip and removed unnecessary test exclusions for Darwin. --- overlays/unstable/goose.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/overlays/unstable/goose.nix b/overlays/unstable/goose.nix index eb644fb..556b55a 100644 --- a/overlays/unstable/goose.nix +++ b/overlays/unstable/goose.nix @@ -23,20 +23,20 @@ let meta.license = lib.licenses.unfree; }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "goose-cli"; - version = "1.0.17"; + version = "1.0.17-2"; src = fetchFromGitHub { owner = "block"; repo = "goose"; - tag = "v${version}"; - #rev = "e7ad230957053dac7643701a69439ac19d5d2bf6"; - hash = "sha256-l/lcwTNUq2xJHh0MKhnDZjRJ/5cANbdar/Vusf38esQ="; + #tag = "v${version}"; + rev = "167ac0efdc372ddbc80273c44d8497eafe0a901e"; + hash = "sha256-dWvqanbNvC4IX6ZRdTZhB0+T9vGNVxAEBj8DtPfN/VE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1xKWzgptnM1ZP0nQXILBoaKVwL2FyXpldTUIa1ITQO0="; + cargoHash = "sha256-53W6gpt5eLw/WHMdEEWD4GmriHk2cAsNRzHv7niAb/0="; nativeBuildInputs = [ pkg-config ]; @@ -59,11 +59,10 @@ rustPlatform.buildRustPackage rec { # need dbus-daemon "--skip=config::base::tests::test_multiple_secrets" "--skip=config::base::tests::test_secret_management" + "--skip=logging::tests::test_log_file_name::with_session_name_and_error_capture" # Observer should be Some with both init project keys set "--skip=tracing::langfuse_layer::tests::test_create_langfuse_observer" "--skip=providers::gcpauth::tests::test_token_refresh_race_condition" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Lazy instance has previously been poisoned "--skip=jetbrains::tests::test_capabilities" "--skip=jetbrains::tests::test_router_creation"