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

refactor(ops/nixos): migrate to depot module arg

Browse source 
Previously the depot argument was provided as config.depot, but the "new
way" of doing things (which is more like the args list provided in the
rest of the depot) is to provide this as the "depot" NixOS module
argument instead.

Change-Id: Ib48b1c7c1bdff9c1eb0618c6cbacc22b651f5f98
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2763
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Luke Granger-Brown 2021-04-02 12:18:50 +00:00 committed by lukegb
parent 999f98436c
commit b35e358eb5
15 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ops/nixos/clbot.nix
View file

@ -1,5 +1,5 @@
# Module that configures CLBot, our Gerrit->IRC info bridge. # Module that configures CLBot, our Gerrit->IRC info bridge.
{ config, lib, pkgs, ... }: { depot, config, lib, pkgs, ... }:
let let
inherit (builtins) attrValues concatStringsSep mapAttrs readFile; inherit (builtins) attrValues concatStringsSep mapAttrs readFile;
@ -31,7 +31,7 @@ let
description = "${description} to ${channel}"; description = "${description} to ${channel}";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
script = "${config.depot.fun.clbot}/bin/clbot ${mkFlags (cfg.flags // { script = "${depot.fun.clbot}/bin/clbot ${mkFlags (cfg.flags // {
irc_channel = channel; irc_channel = channel;
})} -alsologtostderr"; })} -alsologtostderr";

4
ops/nixos/irccat.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { depot, config, lib, pkgs, ... }:
let let
cfg = config.services.depot.irccat; cfg = config.services.depot.irccat;
@ -35,7 +35,7 @@ in {
systemd.services.irccat = { systemd.services.irccat = {
inherit description; inherit description;
preStart = "${configMerge}"; preStart = "${configMerge}";
script = "${config.depot.third_party.irccat}/bin/irccat"; script = "${depot.third_party.irccat}/bin/irccat";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {

8
ops/nixos/monorepo-gerrit.nix
View file

@ -1,11 +1,11 @@
# Gerrit configuration for the TVL monorepo # Gerrit configuration for the TVL monorepo
{ pkgs, config, lib, ... }: { depot, pkgs, config, lib, ... }:
let let
cfg = config.services.gerrit; cfg = config.services.gerrit;
gerritHooks = pkgs.runCommandNoCC "gerrit-hooks" {} '' gerritHooks = pkgs.runCommandNoCC "gerrit-hooks" {} ''
mkdir -p $out mkdir -p $out
ln -s ${config.depot.ops.besadii}/bin/besadii $out/ref-updated ln -s ${depot.ops.besadii}/bin/besadii $out/ref-updated
''; '';
in { in {
services.gerrit = { services.gerrit = {
@ -17,12 +17,12 @@ in {
"hooks" "hooks"
]; ];
plugins = with config.depot.third_party.gerrit_plugins; [ plugins = with depot.third_party.gerrit_plugins; [
checks checks
owners owners
]; ];
package = config.depot.third_party.gerrit; package = depot.third_party.gerrit;
jvmHeapLimit = "4g"; jvmHeapLimit = "4g";

3
ops/nixos/panettone.nix
View file

@ -1,8 +1,7 @@
{ config, lib, pkgs, ... }: { depot, config, lib, pkgs, ... }:
let let
cfg = config.services.depot.panettone; cfg = config.services.depot.panettone;
depot = config.depot;
in { in {
options.services.depot.panettone = with lib; { options.services.depot.panettone = with lib; {
enable = mkEnableOption "Panettone issue tracker"; enable = mkEnableOption "Panettone issue tracker";

4
ops/nixos/paroxysm.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { depot, config, lib, pkgs, ... }:
let let
cfg = config.services.depot.paroxysm; cfg = config.services.depot.paroxysm;
@ -9,7 +9,7 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
systemd.services.paroxysm = { systemd.services.paroxysm = {
inherit description; inherit description;
script = "${config.depot.fun.paroxysm}/bin/paroxysm"; script = "${depot.fun.paroxysm}/bin/paroxysm";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment = { environment = {

4
ops/nixos/smtprelay.nix
View file

@ -1,5 +1,5 @@
# NixOS module for configuring the simple SMTP relay. # NixOS module for configuring the simple SMTP relay.
{ pkgs, config, lib, ... }: { depot, pkgs, config, lib, ... }:
let let
inherit (builtins) attrValues mapAttrs; inherit (builtins) attrValues mapAttrs;
@ -40,7 +40,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.services.smtprelay = { systemd.services.smtprelay = {
inherit description; inherit description;
script = "${config.depot.third_party.smtprelay}/bin/smtprelay ${prepareArgs cfg.args}"; script = "${depot.third_party.smtprelay}/bin/smtprelay ${prepareArgs cfg.args}";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {

3
ops/nixos/sourcegraph.nix
View file

@ -1,10 +1,9 @@
# Run sourcegraph, including its entire machinery, in a container. # Run sourcegraph, including its entire machinery, in a container.
# Running it outside of a container is a futile endeavour for now. # Running it outside of a container is a futile endeavour for now.
{ config, pkgs, lib, ... }: { depot, config, pkgs, lib, ... }:
let let
cfg = config.services.depot.sourcegraph; cfg = config.services.depot.sourcegraph;
depot = config.depot;
in { in {
options.services.depot.sourcegraph = with lib; { options.services.depot.sourcegraph = with lib; {
enable = mkEnableOption "SourceGraph code search engine"; enable = mkEnableOption "SourceGraph code search engine";

8
ops/nixos/tvl-slapd/default.nix
View file

@ -1,9 +1,9 @@
# Configures an OpenLDAP instance for TVL # Configures an OpenLDAP instance for TVL
# #
# TODO(tazjin): Configure ldaps:// # TODO(tazjin): Configure ldaps://
{ config, lib, pkgs, ... }: { depot, lib, pkgs, ... }:
with config.depot.nix.yants; with depot.nix.yants;
let let
user = struct { user = struct {
@ -24,7 +24,7 @@ let
userPassword: ${u.password} userPassword: ${u.password}
''); '');
inherit (config.depot.ops) users; inherit (depot.ops) users;
in { in {
# Use our patched OpenLDAP derivation which enables stronger password hashing. # Use our patched OpenLDAP derivation which enables stronger password hashing.
@ -34,7 +34,7 @@ in {
# *large* number of rebuilds of packages such as GPG and Python. # *large* number of rebuilds of packages such as GPG and Python.
nixpkgs.overlays = [ nixpkgs.overlays = [
(_: _: { (_: _: {
inherit (config.depot.third_party) openldap; inherit (depot.third_party) openldap;
}) })
]; ];

4
ops/nixos/tvl-sso/default.nix
View file

@ -1,8 +1,8 @@
# Configures an Apereo CAS instance for TVL SSO # Configures an Apereo CAS instance for TVL SSO
{ config, ... }: { depot, ... }:
let let
inherit (config.depot.third_party) apereo-cas; inherit (depot.third_party) apereo-cas;
in { in {
config = { config = {
environment.systemPackages = [ apereo-cas ]; environment.systemPackages = [ apereo-cas ];

2
ops/nixos/whitby/default.nix
View file

@ -13,10 +13,8 @@ let
ln -s ${depot.ops.besadii}/bin/besadii $out/bin/post-command ln -s ${depot.ops.besadii}/bin/besadii $out/bin/post-command
''; '';
in lib.fix(self: { in lib.fix(self: {
inherit depot;
imports = [ imports = [
"${depot.depotPath}/ops/nixos/clbot.nix" "${depot.depotPath}/ops/nixos/clbot.nix"
"${depot.depotPath}/ops/nixos/depot.nix"
"${depot.depotPath}/ops/nixos/irccat.nix" "${depot.depotPath}/ops/nixos/irccat.nix"
"${depot.depotPath}/ops/nixos/monorepo-gerrit.nix" "${depot.depotPath}/ops/nixos/monorepo-gerrit.nix"
"${depot.depotPath}/ops/nixos/panettone.nix" "${depot.depotPath}/ops/nixos/panettone.nix"

4
ops/nixos/www/code.tvl.fyi.nix
View file

@ -1,4 +1,4 @@
{ config, ... }: { depot, ... }:
{ {
imports = [ imports = [
@ -17,7 +17,7 @@
# #
# TODO(tazjin): Implement a way of serving this dynamically # TODO(tazjin): Implement a way of serving this dynamically
location = /about/tvix/docs/component-flow.svg { location = /about/tvix/docs/component-flow.svg {
alias ${config.depot.tvix.docs.svg}/component-flow.svg; alias ${depot.tvix.docs.svg}/component-flow.svg;
} }
# Static assets must always hit the root. # Static assets must always hit the root.

5
ops/nixos/www/tazj.in.nix
View file

@ -1,8 +1,7 @@
# serve tazjin's website & blog # serve tazjin's website & blog
{ config, lib, pkgs, ... }: { depot, config, lib, pkgs, ... }:
let depot = config.depot; {
in {
imports = [ imports = [
./base.nix ./base.nix
]; ];

4
ops/nixos/www/todo.tvl.fyi.nix
View file

@ -1,4 +1,4 @@
{ config, ... }: { depot, ... }:
{ {
imports = [ imports = [
@ -9,7 +9,7 @@
services.nginx.virtualHosts."todo.tvl.fyi" = { services.nginx.virtualHosts."todo.tvl.fyi" = {
serverName = "todo.tvl.fyi"; serverName = "todo.tvl.fyi";
serverAliases = [ "todo.tvl.su" ]; serverAliases = [ "todo.tvl.su" ];
root = config.depot.web.todolist; root = depot.web.todolist;
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;

4
ops/nixos/www/tvl.fyi.nix
View file

@ -1,4 +1,4 @@
{ config, ... }: { depot, ... }:
{ {
imports = [ imports = [
@ -8,7 +8,7 @@
config = { config = {
services.nginx.virtualHosts."tvl.fyi" = { services.nginx.virtualHosts."tvl.fyi" = {
serverName = "tvl.fyi"; serverName = "tvl.fyi";
root = config.depot.web.tvl; root = depot.web.tvl;
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;

4
ops/nixos/www/wigglydonke.rs.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { depot, lib, pkgs, ... }:
{ {
imports = [ imports = [
@ -9,7 +9,7 @@
services.nginx.virtualHosts."wigglydonke.rs" = { services.nginx.virtualHosts."wigglydonke.rs" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
root = "${config.depot.depotPath}/users/glittershark/wigglydonke.rs"; root = "${depot.depotPath}/users/glittershark/wigglydonke.rs";
}; };
}; };
} }