From c92082e6bf1e139816af7616f14fb5f45f9de62b Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Mon, 16 Mar 2026 17:25:29 -0400 Subject: [PATCH] add staging wally instance --- clients/quadraticserver/matrix/cinny.nix | 72 ++++++++++++++++-------- 1 file changed, 47 insertions(+), 25 deletions(-) diff --git a/clients/quadraticserver/matrix/cinny.nix b/clients/quadraticserver/matrix/cinny.nix index 84ab0f5..cff730a 100644 --- a/clients/quadraticserver/matrix/cinny.nix +++ b/clients/quadraticserver/matrix/cinny.nix @@ -1,29 +1,51 @@ { pkgs, ... }: { - services.caddy.virtualHosts."app.federated.nexus".extraConfig = '' - root ${ - pkgs.cinny.override { - conf = { - defaultHomeserver = 0; - homeserverList = [ "federated.nexus" ]; - allowCustomHomeservers = false; + services.caddy.virtualHosts = + let + mkCinny = override: { + extraConfig = '' + root ${ + pkgs.cinny.override { + conf = { + defaultHomeserver = 0; + homeserverList = [ "federated.nexus" ]; + allowCustomHomeservers = false; + }; + cinny-unwrapped = pkgs.cinny-unwrapped.overrideAttrs override; + } + } + try_files {path} {path}/ /index.html + file_server + ''; + }; + in + { + "app.federated.nexus" = mkCinny (old: rec { + src = pkgs.fetchFromCodeberg { + owner = "lapingvino"; + repo = "cinny"; + rev = "d5ba8537a418a0950adad6f7c4f488078dff6a13"; + hash = "sha256-+WOpBpSzXgBbG5RyMotvJWauPOKjbSI7X6XaRNssd/I="; }; - cinny-unwrapped = pkgs.cinny-unwrapped.overrideAttrs (old: rec { - src = pkgs.fetchFromCodeberg { - owner = "lapingvino"; - repo = "cinny"; - rev = "d5ba8537a418a0950adad6f7c4f488078dff6a13"; - hash = "sha256-+WOpBpSzXgBbG5RyMotvJWauPOKjbSI7X6XaRNssd/I="; - }; - npmDeps = pkgs.fetchNpmDeps { - inherit src; - name = "${old.pname}-${old.version}-npm-deps"; - hash = "sha256-a4cnxo5smN+a6DWKPPkbGkd8gcQe/jazSEmrqKcN0fA="; - }; - }); - } - } - try_files {path} {path}/ /index.html - file_server - ''; + npmDeps = pkgs.fetchNpmDeps { + inherit src; + name = "${old.pname}-${old.version}-npm-deps"; + hash = "sha256-a4cnxo5smN+a6DWKPPkbGkd8gcQe/jazSEmrqKcN0fA="; + }; + }); + + "staging.app.federated.nexus" = mkCinny (old: rec { + src = pkgs.fetchFromCodeberg { + owner = "lapingvino"; + repo = "cinny"; + rev = "8228227f64cf22c8cda2bc7cea1d5948d007822b"; + hash = "sha256-JcZ2jhKrxwtzbnhvCAS4yVF788TmocYoIOFJsV0QdbU="; + }; + npmDeps = pkgs.fetchNpmDeps { + inherit src; + name = "${old.pname}-${old.version}-npm-deps"; + hash = "sha256-RZEQojhMpwimws5eQj/eCMs/rDSfvtlQmLRpd+scv8g="; + }; + }); + }; }