refactor(ops/modules): Move cgit configuration into a module

The ancient `//web/cgit-taz` path stems from the time I had
code.tazj.in serving my initial version of the depot.

I've been meaning to clean this up for forever, so here we go.

Note that this leaves the git-serving module in a strange state where
it only deals with josh. I'll rename it accordingly.

Change-Id: I47ed1e9d90958299b5440a18a1b9075274754e33
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5294
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2022-02-16 21:30:17 +03:00 committed by tazjin
parent 7e65edcb16
commit cb8f050b9c
4 changed files with 40 additions and 39 deletions

View file

@ -8,6 +8,7 @@ in
{ {
imports = [ imports = [
"${depot.path}/ops/modules/atward.nix" "${depot.path}/ops/modules/atward.nix"
"${depot.path}/ops/modules/cgit/default.nix"
"${depot.path}/ops/modules/clbot.nix" "${depot.path}/ops/modules/clbot.nix"
"${depot.path}/ops/modules/gerrit-queue.nix" "${depot.path}/ops/modules/gerrit-queue.nix"
"${depot.path}/ops/modules/git-serving.nix" "${depot.path}/ops/modules/git-serving.nix"
@ -392,6 +393,7 @@ in
nixery.enable = true; nixery.enable = true;
# Run cgit & josh to serve git # Run cgit & josh to serve git
cgit.enable = true;
git-serving.enable = true; git-serving.enable = true;
# Configure backups to GleSYS # Configure backups to GleSYS

View file

@ -1,14 +1,10 @@
# This derivation configures a 'cgit' instance to serve repositories # Configuration for running the TVL cgit instance using thttpd.
# from a different source. { config, depot, lib, pkgs, ... }:
{ depot, pkgs, ... }:
let let
inherit (pkgs) inherit (pkgs) writeText;
mime-types
thttpd cfg = config.services.depot.cgit;
writeShellScriptBin
writeText
;
cgitConfig = writeText "cgitrc" '' cgitConfig = writeText "cgitrc" ''
# Global configuration # Global configuration
@ -21,7 +17,7 @@ let
enable-log-linecount=1 enable-log-linecount=1
enable-follow-links=1 enable-follow-links=1
enable-blame=1 enable-blame=1
mimetype-file=${mime-types}/etc/mime.types mimetype-file=${pkgs.mime-types}/etc/mime.types
logo=https://static.tvl.fyi/${depot.web.static.drvHash}/logo-animated.svg logo=https://static.tvl.fyi/${depot.web.static.drvHash}/logo-animated.svg
# Repository configuration # Repository configuration
@ -33,7 +29,7 @@ let
''; '';
thttpdConfig = writeText "thttpd.conf" '' thttpdConfig = writeText "thttpd.conf" ''
port=2448 port=${toString cfg.port}
dir=${depot.third_party.cgit}/cgit dir=${depot.third_party.cgit}/cgit
nochroot nochroot
novhost novhost
@ -45,8 +41,7 @@ let
# configuration. # configuration.
# #
# Things are done this way because recompilation of thttpd is much # Things are done this way because recompilation of thttpd is much
# faster than cgit and I don't want to wait long when iterating on # faster than cgit.
# config.
thttpdConfigPatch = writeText "thttpd_cgit_conf.patch" '' thttpdConfigPatch = writeText "thttpd_cgit_conf.patch" ''
diff --git a/libhttpd.c b/libhttpd.c diff --git a/libhttpd.c b/libhttpd.c
index c6b1622..eef4b73 100644 index c6b1622..eef4b73 100644
@ -60,13 +55,38 @@ let
envp[envn++] = build_env( "PATH=%s", CGI_PATH ); envp[envn++] = build_env( "PATH=%s", CGI_PATH );
#ifdef CGI_LD_LIBRARY_PATH #ifdef CGI_LD_LIBRARY_PATH
''; '';
thttpdCgit = thttpd.overrideAttrs (old: {
thttpdCgit = pkgs.thttpd.overrideAttrs (old: {
patches = [ patches = [
./thttpd_cgi_idx.patch ./thttpd_cgi_idx.patch
thttpdConfigPatch thttpdConfigPatch
]; ];
}); });
in in
writeShellScriptBin "cgit-launch" '' {
exec ${thttpdCgit}/bin/thttpd -D -C ${thttpdConfig} options.services.depot.cgit = with lib; {
'' enable = mkEnableOption "Run cgit web interface for depot";
port = mkOption {
description = "Port on which cgit should listen";
type = types.int;
default = 2448;
};
};
config = lib.mkIf cfg.enable {
systemd.services.cgit = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "on-failure";
User = "git";
Group = "git";
ExecStart = pkgs.writeShellScript "cgit-launch" ''
exec ${thttpdCgit}/bin/thttpd -D -C ${thttpdConfig}
'';
};
};
};
}

View file

@ -1,13 +1,4 @@
# Configures public git-serving infrastructure for TVL, this involves: # Configures the public josh instance for serving the depot.
#
# 1. cgit (running at code.tvl.fyi) for web views of the repository
# 2. josh (for cloning the repository and its distinct subtrees)
#
# We also run Sourcegraph for browsing the repository, but this is
# currently configured in a separate module
# (//ops/modules/sourcegraph.nix)
#
# TODO(tazjin): Move //web/cgit-taz configuration in here instead.
{ config, depot, lib, pkgs, ... }: { config, depot, lib, pkgs, ... }:
let let
@ -25,18 +16,6 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Run cgit for the depot. The onion here is nginx(thttpd(cgit)).
systemd.services.cgit = {
wantedBy = [ "multi-user.target" ];
script = "${depot.web.cgit-taz}/bin/cgit-launch";
serviceConfig = {
Restart = "on-failure";
User = "git";
Group = "git";
};
};
# Run josh for the depot. # Run josh for the depot.
systemd.services.josh = { systemd.services.josh = {
description = "josh - partial cloning of monorepos"; description = "josh - partial cloning of monorepos";