diff --git a/hosts/marvin/services/shelfmark.nix b/hosts/marvin/services/shelfmark.nix index 5824b5f7..62f85496 100644 --- a/hosts/marvin/services/shelfmark.nix +++ b/hosts/marvin/services/shelfmark.nix @@ -52,6 +52,13 @@ in ]; }; + # tsnsrv sidecar + services.tsnsrv.services.shelfmark = { + urlParts = { + port = d.port; + }; + }; + age.secrets.shelfmark-secrets = { file = ./secrets/shelfmark/secrets.age; owner = "booklore"; diff --git a/hosts/prefect/services/caddy.nix b/hosts/prefect/services/caddy.nix index 3b2a1548..7271cb7f 100644 --- a/hosts/prefect/services/caddy.nix +++ b/hosts/prefect/services/caddy.nix @@ -14,12 +14,6 @@ let # keep-sorted end ]; - tsHosts = self.lib.caddy.mkTsSites [ - # keep-sorted start - "shelfmark" - # keep-sorted end - ]; - directHosts = self.lib.caddy.mkDirectSites [ # keep-sorted start "booklore" @@ -35,12 +29,11 @@ in package = pkgs.caddy.withPlugins { plugins = [ "github.com/caddy-dns/desec@v1.1.0" - "github.com/greenpau/caddy-security@v1.1.32" - "github.com/tailscale/caddy-tailscale@v0.0.0-20260106222316-bb080c4414ac" - "github.com/mholt/caddy-l4@v0.0.0-20260216070754-eca560d759c9" + "github.com/greenpau/caddy-security@v1.1.62" + "github.com/mholt/caddy-l4@v0.1.1" "github.com/mohammed90/caddy-git-fs@v0.0.0-20240805164056-529acecd1830" ]; - hash = "sha256-5ys0UxyBapK0uFaDBMRfXw5tVW2phpQ+uxjzT1B3Nco="; + hash = "sha256-KEY7CNLqj/SZQaCYhcFN3di6FXDJMAx5sCUOhWPzGjU="; }; email = "pyrox@pyrox.dev"; virtualHosts = { @@ -199,7 +192,6 @@ in }; } // anubisHosts - // tsHosts // directHosts; # Blog/SSH Config globalConfig = ''