From eb167c71a779b978a1fd4d6cd29fdf47268c578d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 9 Oct 2023 16:21:57 +0200 Subject: fix(ops/code.tvl.fyi): fix josh-proxy cmdline args It looks like josh is only listening on v4 currently: https://github.com/josh-project/josh/blob/1586eab06284ce668779c87f00a1fb5fa9763be0/josh-proxy/src/bin/josh-proxy.rs#L1429 Also, the remote URL to push to is (or became) https://cl.tvl.fyi/a, not just https://cl.tvl.fyi/, update it Change-Id: Ic59bc51c28be913d833186c715e9a9eb960bbd6e Reviewed-on: https://cl.tvl.fyi/c/depot/+/9591 Reviewed-by: tazjin Autosubmit: flokli Tested-by: BuildkiteCI --- ops/modules/josh.nix | 2 +- ops/modules/www/code.tvl.fyi.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ops/modules') diff --git a/ops/modules/josh.nix b/ops/modules/josh.nix index 4591ebf0f078..5bf00ca31bad 100644 --- a/ops/modules/josh.nix +++ b/ops/modules/josh.nix @@ -26,7 +26,7 @@ in DynamicUser = true; StateDirectory = "josh"; Restart = "always"; - ExecStart = "${depot.third_party.josh}/bin/josh-proxy --no-background --local /var/lib/josh --port ${toString cfg.port} --remote https://cl.tvl.fyi/ --require-auth"; + ExecStart = "${depot.third_party.josh}/bin/josh-proxy --no-background --local /var/lib/josh --port ${toString cfg.port} --remote https://cl.tvl.fyi/a --require-auth"; }; }; }; diff --git a/ops/modules/www/code.tvl.fyi.nix b/ops/modules/www/code.tvl.fyi.nix index 7f0479908b06..8d8938bcaef6 100644 --- a/ops/modules/www/code.tvl.fyi.nix +++ b/ops/modules/www/code.tvl.fyi.nix @@ -52,7 +52,7 @@ # Git operations on depot.git hit josh location /depot.git { - proxy_pass http://localhost:${toString config.services.depot.josh.port}; + proxy_pass http://127.0.0.1:${toString config.services.depot.josh.port}; } # Git clone operations on '/' should be redirected to josh now. -- cgit 1.4.1