mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(ops/modules): Rename git-serving -> josh

Browse source 
cgit has its own module now

Change-Id: I9b4cc322374517b8bd3db43345831e2bf43c4bb1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5295
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2022-02-16 21:34:18 +03:00 committed by tazjin
parent cb8f050b9c
commit c72c1efdeb
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ops/machines/whitby/default.nix
View file

@ -11,8 +11,8 @@ in
"${depot.path}/ops/modules/cgit/default.nix"
"${depot.path}/ops/modules/clbot.nix"
"${depot.path}/ops/modules/gerrit-queue.nix"
"${depot.path}/ops/modules/git-serving.nix"
"${depot.path}/ops/modules/irccat.nix"
"${depot.path}/ops/modules/josh.nix"
"${depot.path}/ops/modules/monorepo-gerrit.nix"
"${depot.path}/ops/modules/nixery.nix"
"${depot.path}/ops/modules/oauth2_proxy.nix"
@ -394,7 +394,7 @@ in
# Run cgit & josh to serve git
cgit.enable = true;
git-serving.enable = true;
josh.enable = true;
# Configure backups to GleSYS
restic = {

10
ops/modules/git-serving.nix → ops/modules/josh.nix
View file

@ -2,13 +2,13 @@
{ config, depot, lib, pkgs, ... }:
let
cfg = config.services.depot.git-serving;
cfg = config.services.depot.josh;
in
{
options.services.depot.git-serving = with lib; {
enable = mkEnableOption "Enable cgit & josh configuration";
options.services.depot.josh = with lib; {
enable = mkEnableOption "Enable josh for serving the depot";
joshPort = mkOption {
port = mkOption {
description = "Port on which josh should listen";
type = types.int;
default = 5674;
@ -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.joshPort} --remote https://cl.tvl.fyi/";
ExecStart = "${depot.third_party.josh}/bin/josh-proxy --no-background --local /var/lib/josh --port ${toString cfg.port} --remote https://cl.tvl.fyi/";
};
};
};

2
ops/modules/www/code.tvl.fyi.nix
View file

@ -22,7 +22,7 @@
# Git operations on depot.git hit josh
location /depot.git {
proxy_pass http://localhost:${toString config.services.depot.git-serving.joshPort};
proxy_pass http://localhost:${toString config.services.depot.josh.port};
}
# Git clone operations on '/' should be redirected to josh now.