diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-16T15·46+0300 |
---|---|---|
committer | tazjin <mail@tazj.in> | 2021-09-16T20·34+0000 |
commit | ec38839c337654637c05af81db1b6f6afdec9102 (patch) | |
tree | bc16ec20b2037431018c834879b7ded9f6fa02d8 /ops/modules/www/code.tvl.fyi.nix | |
parent | f35afb0e4af2e39336f0bdf369f00797d9fcc37b (diff) |
feat(git-serving): Configure josh to serve the depot over HTTP r/2877
Previously we served the dumb git HTTP protocol from code.tvl.fyi via cgit. This CL disables this feature and instead runs josh in the same location (by redirecting appropriately), but while also enabling partial cloning of all subtrees of the depot. For example, after this CL the following would result in an independent clone of //nix/readTree: git clone https://code.tvl.fyi/depot.git:/nix/readTree.git Note that there are no josh workspaces configured at all for now, these references are only for static depot subpaths. Please refer to the documentation for josh for more information on available kinds of josh filters. Josh state is kept in a systemd state directory in /var/lib/josh and backed up to Restic. Backing this up is necessary, as josh uses stateful information to do things like tracking merges and rewriting history per subtree appropriately to avoid cloned repositories ending up in peculiar states. Change-Id: I156f0298c2aa42e3bdbf5a0e86109070d640c56e Reviewed-on: https://cl.tvl.fyi/c/depot/+/3563 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'ops/modules/www/code.tvl.fyi.nix')
-rw-r--r-- | ops/modules/www/code.tvl.fyi.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ops/modules/www/code.tvl.fyi.nix b/ops/modules/www/code.tvl.fyi.nix index c8a4b27b1b52..4c182d34f28d 100644 --- a/ops/modules/www/code.tvl.fyi.nix +++ b/ops/modules/www/code.tvl.fyi.nix @@ -1,4 +1,4 @@ -{ depot, ... }: +{ depot, config, ... }: { imports = [ @@ -20,12 +20,22 @@ alias ${depot.tvix.docs.svg}/component-flow.svg; } + # Git operations on depot.git hit josh + location /depot.git { + proxy_pass http://localhost:${toString config.services.depot.git-serving.joshPort}; + } + + # Git clone operations on '/' should be redirected to josh now. + location = /info/refs { + return 302 https://code.tvl.fyi/depot.git/info/refs$is_args$args; + } + # Static assets must always hit the root. location ~ ^/(favicon\.ico|cgit\.(css|png))$ { proxy_pass http://localhost:2448; } - # Everything else hits the depot directly. + # Everything else is forwarded to cgit for the web view location / { proxy_pass http://localhost:2448/cgit.cgi/depot/; } |