chore: remove whitby configuration
Removes whitby DNS records and other related configuration that is no longer required now that whitby is gone. whitby served us well. RIP. This resolves b/433. Change-Id: I56fe6f88cde9112fc3bfc79758ac33e88a743422 Reviewed-on: https://cl.tvl.fyi/c/depot/+/13117 Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su>
This commit is contained in:
parent
67affb7b46
commit
c88fae5277
17 changed files with 37 additions and 417 deletions
10
default.nix
10
default.nix
|
|
@ -27,13 +27,12 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
exceptions = [
|
exceptions = [
|
||||||
# whitby is allowed to access //users for several reasons:
|
# machines is allowed to access //users for several reasons:
|
||||||
#
|
#
|
||||||
# 1. User SSH keys are set in //users.
|
# 1. User SSH keys are set in //users.
|
||||||
# 2. Some personal websites or demo projects are served from it.
|
# 2. Some personal websites or demo projects are served from there.
|
||||||
[ "ops" "machines" "bugry" ]
|
[ "ops" "machines" "bugry" ]
|
||||||
[ "ops" "machines" "nevsky" ]
|
[ "ops" "machines" "nevsky" ]
|
||||||
[ "ops" "machines" "whitby" ]
|
|
||||||
|
|
||||||
# Due to evaluation order this also affects these targets.
|
# Due to evaluation order this also affects these targets.
|
||||||
# TODO(tazjin): Can this one be removed somehow?
|
# TODO(tazjin): Can this one be removed somehow?
|
||||||
|
|
@ -51,9 +50,8 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
exceptions = [
|
exceptions = [
|
||||||
# For the same reason as above, whitby is exempt to serve the
|
# For the same reason as above, machines are exempt to serve the corp
|
||||||
# corp website.
|
# website.
|
||||||
[ "ops" "machines" "whitby" ]
|
|
||||||
[ "ops" "nixos" ]
|
[ "ops" "nixos" ]
|
||||||
[ "ops" "machines" "all-systems" ]
|
[ "ops" "machines" "all-systems" ]
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -39,20 +39,6 @@ resource "glesys_dnsdomain_record" "tvl_fyi_apex_AAAA" {
|
||||||
data = var.bugry_ipv6
|
data = var.bugry_ipv6
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "glesys_dnsdomain_record" "tvl_fyi_whitby_A" {
|
|
||||||
domain = glesys_dnsdomain.tvl_fyi.id
|
|
||||||
host = "whitby"
|
|
||||||
type = "A"
|
|
||||||
data = var.whitby_ipv4
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "glesys_dnsdomain_record" "tvl_fyi_whitby_AAAA" {
|
|
||||||
domain = glesys_dnsdomain.tvl_fyi.id
|
|
||||||
host = "whitby"
|
|
||||||
type = "AAAA"
|
|
||||||
data = var.whitby_ipv6
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "glesys_dnsdomain_record" "tvl_fyi_nevsky_A" {
|
resource "glesys_dnsdomain_record" "tvl_fyi_nevsky_A" {
|
||||||
domain = glesys_dnsdomain.tvl_fyi.id
|
domain = glesys_dnsdomain.tvl_fyi.id
|
||||||
host = "nevsky"
|
host = "nevsky"
|
||||||
|
|
@ -113,7 +99,7 @@ resource "glesys_dnsdomain_record" "cache_tvl_fyi_A" {
|
||||||
host = "cache"
|
host = "cache"
|
||||||
type = "A"
|
type = "A"
|
||||||
data = each.key
|
data = each.key
|
||||||
for_each = toset([var.whitby_ipv4, var.nevsky_ipv4])
|
for_each = toset([var.nevsky_ipv4])
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "glesys_dnsdomain_record" "cache_tvl_fyi_AAAA" {
|
resource "glesys_dnsdomain_record" "cache_tvl_fyi_AAAA" {
|
||||||
|
|
@ -121,18 +107,11 @@ resource "glesys_dnsdomain_record" "cache_tvl_fyi_AAAA" {
|
||||||
host = "cache"
|
host = "cache"
|
||||||
type = "AAAA"
|
type = "AAAA"
|
||||||
data = each.key
|
data = each.key
|
||||||
for_each = toset([var.whitby_ipv6, var.nevsky_ipv6])
|
for_each = toset([var.nevsky_ipv6])
|
||||||
}
|
}
|
||||||
|
|
||||||
# Builderball cache records
|
# Builderball cache records
|
||||||
|
|
||||||
resource "glesys_dnsdomain_record" "tvl_fyi_cache_whitby_CNAME" {
|
|
||||||
domain = glesys_dnsdomain.tvl_fyi.id
|
|
||||||
type = "CNAME"
|
|
||||||
data = "whitby.tvl.fyi."
|
|
||||||
host = "whitby.cache"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "glesys_dnsdomain_record" "tvl_fyi_cache_nevsky_CNAME" {
|
resource "glesys_dnsdomain_record" "tvl_fyi_cache_nevsky_CNAME" {
|
||||||
domain = glesys_dnsdomain.tvl_fyi.id
|
domain = glesys_dnsdomain.tvl_fyi.id
|
||||||
type = "CNAME"
|
type = "CNAME"
|
||||||
|
|
|
||||||
|
|
@ -39,20 +39,6 @@ resource "glesys_dnsdomain_record" "tvl_su_apex_AAAA" {
|
||||||
data = var.bugry_ipv6
|
data = var.bugry_ipv6
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "glesys_dnsdomain_record" "tvl_su_whitby_A" {
|
|
||||||
domain = glesys_dnsdomain.tvl_su.id
|
|
||||||
host = "whitby"
|
|
||||||
type = "A"
|
|
||||||
data = var.whitby_ipv4
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "glesys_dnsdomain_record" "tvl_su_whitby_AAAA" {
|
|
||||||
domain = glesys_dnsdomain.tvl_su.id
|
|
||||||
host = "whitby"
|
|
||||||
type = "AAAA"
|
|
||||||
data = var.whitby_ipv6
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "glesys_dnsdomain_record" "tvl_su_sanduny_A" {
|
resource "glesys_dnsdomain_record" "tvl_su_sanduny_A" {
|
||||||
domain = glesys_dnsdomain.tvl_su.id
|
domain = glesys_dnsdomain.tvl_su.id
|
||||||
host = "sanduny"
|
host = "sanduny"
|
||||||
|
|
|
||||||
|
|
@ -51,16 +51,6 @@ resource "glesys_objectstorage_credential" "litestream" {
|
||||||
description = "key for litestream"
|
description = "key for litestream"
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "whitby_ipv4" {
|
|
||||||
type = string
|
|
||||||
default = "49.12.129.211"
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "whitby_ipv6" {
|
|
||||||
type = string
|
|
||||||
default = "2a01:4f8:242:5b21:0:feed:edef:beef"
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "nevsky_ipv4" {
|
variable "nevsky_ipv4" {
|
||||||
type = string
|
type = string
|
||||||
default = "188.225.81.75"
|
default = "188.225.81.75"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
(with depot.ops.machines; [
|
(with depot.ops.machines; [
|
||||||
sanduny
|
sanduny
|
||||||
whitby
|
|
||||||
bugry
|
bugry
|
||||||
nevsky
|
nevsky
|
||||||
]) ++
|
]) ++
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
set noparent
|
|
||||||
|
|
||||||
# Want in on this list? Try paying!
|
|
||||||
lukegb
|
|
||||||
tazjin
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
whitby
|
|
||||||
======
|
|
||||||
|
|
||||||
`whitby.tvl.fyi` is our dedicated server providing continuous
|
|
||||||
integration services and other random nonsense.
|
|
||||||
|
|
@ -1,319 +0,0 @@
|
||||||
{ depot, lib, pkgs, ... }: # readTree options
|
|
||||||
{ config, ... }: # passed by module system
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (builtins) listToAttrs;
|
|
||||||
inherit (lib) range;
|
|
||||||
|
|
||||||
mod = name: depot.path.origSrc + ("/ops/modules/" + name);
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
(mod "builderball.nix")
|
|
||||||
(mod "harmonia.nix")
|
|
||||||
(mod "journaldriver.nix")
|
|
||||||
(mod "tvl-buildkite.nix")
|
|
||||||
(mod "tvl-users.nix")
|
|
||||||
(mod "www/cache.tvl.fyi.nix")
|
|
||||||
(mod "www/cache.tvl.su.nix")
|
|
||||||
(mod "www/self-cache.tvl.fyi.nix")
|
|
||||||
(mod "www/self-redirect.nix")
|
|
||||||
(mod "www/wigglydonke.rs.nix")
|
|
||||||
|
|
||||||
(depot.third_party.agenix.src + "/modules/age.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
hardware = {
|
|
||||||
enableRedistributableFirmware = true;
|
|
||||||
cpu.amd.updateMicrocode = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
boot = {
|
|
||||||
tmp.useTmpfs = true;
|
|
||||||
kernelModules = [ "kvm-amd" ];
|
|
||||||
supportedFilesystems = [ "zfs" ];
|
|
||||||
|
|
||||||
initrd = {
|
|
||||||
availableKernelModules = [
|
|
||||||
"igb"
|
|
||||||
"xhci_pci"
|
|
||||||
"nvme"
|
|
||||||
"ahci"
|
|
||||||
"usbhid"
|
|
||||||
"usb_storage"
|
|
||||||
"sr_mod"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Enable SSH in the initrd so that we can enter disk encryption
|
|
||||||
# passwords remotely.
|
|
||||||
network = {
|
|
||||||
enable = true;
|
|
||||||
ssh = {
|
|
||||||
enable = true;
|
|
||||||
port = 2222;
|
|
||||||
authorizedKeys =
|
|
||||||
depot.users.tazjin.keys.all
|
|
||||||
++ depot.users.lukegb.keys.all
|
|
||||||
++ [ depot.users.aspen.keys.whitby ];
|
|
||||||
|
|
||||||
hostKeys = [
|
|
||||||
/etc/secrets/initrd_host_ed25519_key
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# this will launch the zfs password prompt on login and kill the
|
|
||||||
# other prompt
|
|
||||||
postCommands = ''
|
|
||||||
echo "zfs load-key -a && killall zfs" >> /root/.profile
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
kernel.sysctl = {
|
|
||||||
"net.ipv4.tcp_congestion_control" = "bbr";
|
|
||||||
};
|
|
||||||
|
|
||||||
loader.grub = {
|
|
||||||
enable = true;
|
|
||||||
efiSupport = true;
|
|
||||||
efiInstallAsRemovable = true;
|
|
||||||
device = "/dev/disk/by-id/nvme-SAMSUNG_MZQLB1T9HAJR-00007_S439NA0N201620";
|
|
||||||
};
|
|
||||||
|
|
||||||
zfs.requestEncryptionCredentials = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems = {
|
|
||||||
"/" = {
|
|
||||||
device = "zroot/root";
|
|
||||||
fsType = "zfs";
|
|
||||||
};
|
|
||||||
|
|
||||||
"/boot" = {
|
|
||||||
device = "/dev/disk/by-uuid/073E-7FBD";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
|
|
||||||
"/nix" = {
|
|
||||||
device = "zroot/nix";
|
|
||||||
fsType = "zfs";
|
|
||||||
};
|
|
||||||
|
|
||||||
"/home" = {
|
|
||||||
device = "zroot/home";
|
|
||||||
fsType = "zfs";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking = {
|
|
||||||
# Glass is boring, but Luke doesn't like Wapping - the Prospect of
|
|
||||||
# Whitby, however, is quite a pleasant establishment.
|
|
||||||
hostName = "whitby";
|
|
||||||
domain = "tvl.fyi";
|
|
||||||
hostId = "b38ca543";
|
|
||||||
useDHCP = false;
|
|
||||||
|
|
||||||
# Don't use Hetzner's DNS servers.
|
|
||||||
nameservers = [
|
|
||||||
"8.8.8.8"
|
|
||||||
"8.8.4.4"
|
|
||||||
];
|
|
||||||
|
|
||||||
defaultGateway6 = {
|
|
||||||
address = "fe80::1";
|
|
||||||
interface = "enp196s0";
|
|
||||||
};
|
|
||||||
|
|
||||||
firewall.allowedTCPPorts = [ 22 80 443 4238 8443 29418 ];
|
|
||||||
firewall.allowedUDPPorts = [ 8443 ];
|
|
||||||
|
|
||||||
interfaces.enp196s0.useDHCP = true;
|
|
||||||
interfaces.enp196s0.ipv6.addresses = [
|
|
||||||
{
|
|
||||||
address = "2a01:04f8:0242:5b21::feed:edef:beef";
|
|
||||||
prefixLength = 64;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Generate an immutable /etc/resolv.conf from the nameserver settings
|
|
||||||
# above (otherwise DHCP overwrites it):
|
|
||||||
environment.etc."resolv.conf" = with lib; {
|
|
||||||
source = pkgs.writeText "resolv.conf" ''
|
|
||||||
${concatStringsSep "\n" (map (ns: "nameserver ${ns}") config.networking.nameservers)}
|
|
||||||
options edns0
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# Disable background git gc system-wide, as it has a tendency to break CI.
|
|
||||||
environment.etc."gitconfig".source = pkgs.writeText "gitconfig" ''
|
|
||||||
[gc]
|
|
||||||
autoDetach = false
|
|
||||||
'';
|
|
||||||
|
|
||||||
time.timeZone = "UTC";
|
|
||||||
|
|
||||||
nix = {
|
|
||||||
nrBuildUsers = 256;
|
|
||||||
settings = {
|
|
||||||
max-jobs = lib.mkDefault 64;
|
|
||||||
secret-key-files = "/run/agenix/nix-cache-priv";
|
|
||||||
|
|
||||||
trusted-users = [
|
|
||||||
"aspen"
|
|
||||||
"lukegb"
|
|
||||||
"tazjin"
|
|
||||||
"sterni"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
sshServe = {
|
|
||||||
enable = true;
|
|
||||||
keys = with depot.users;
|
|
||||||
tazjin.keys.all
|
|
||||||
++ lukegb.keys.all
|
|
||||||
++ [ aspen.keys.whitby ]
|
|
||||||
++ sterni.keys.all
|
|
||||||
;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.mtr.enable = true;
|
|
||||||
programs.mosh.enable = true;
|
|
||||||
services.openssh = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
PasswordAuthentication = false;
|
|
||||||
KbdInteractiveAuthentication = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Configure secrets for services that need them.
|
|
||||||
age.secrets =
|
|
||||||
let
|
|
||||||
secretFile = name: depot.ops.secrets."${name}.age";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
clbot.file = secretFile "clbot";
|
|
||||||
gerrit-autosubmit.file = secretFile "gerrit-autosubmit";
|
|
||||||
grafana.file = secretFile "grafana";
|
|
||||||
irccat.file = secretFile "irccat";
|
|
||||||
keycloak-db.file = secretFile "keycloak-db";
|
|
||||||
owothia.file = secretFile "owothia";
|
|
||||||
panettone.file = secretFile "panettone";
|
|
||||||
smtprelay.file = secretFile "smtprelay";
|
|
||||||
teleirc.file = secretFile "teleirc";
|
|
||||||
|
|
||||||
nix-cache-priv = {
|
|
||||||
file = secretFile "nix-cache-priv";
|
|
||||||
mode = "0440";
|
|
||||||
group = "harmonia";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildkite-agent-token = {
|
|
||||||
file = secretFile "buildkite-agent-token";
|
|
||||||
mode = "0440";
|
|
||||||
group = "buildkite-agents";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildkite-graphql-token = {
|
|
||||||
file = secretFile "buildkite-graphql-token";
|
|
||||||
mode = "0440";
|
|
||||||
group = "buildkite-agents";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildkite-besadii-config = {
|
|
||||||
file = secretFile "besadii";
|
|
||||||
mode = "0440";
|
|
||||||
group = "buildkite-agents";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildkite-private-key = {
|
|
||||||
file = secretFile "buildkite-ssh-private-key";
|
|
||||||
mode = "0440";
|
|
||||||
group = "buildkite-agents";
|
|
||||||
};
|
|
||||||
|
|
||||||
gerrit-besadii-config = {
|
|
||||||
file = secretFile "besadii";
|
|
||||||
owner = "git";
|
|
||||||
};
|
|
||||||
|
|
||||||
gerrit-secrets = {
|
|
||||||
file = secretFile "gerrit-secrets";
|
|
||||||
path = "/var/lib/gerrit/etc/secure.config";
|
|
||||||
owner = "git";
|
|
||||||
mode = "0400";
|
|
||||||
};
|
|
||||||
|
|
||||||
clbot-ssh = {
|
|
||||||
file = secretFile "clbot-ssh";
|
|
||||||
owner = "clbot";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Not actually a secret
|
|
||||||
nix-cache-pub = {
|
|
||||||
file = secretFile "nix-cache-pub";
|
|
||||||
mode = "0444";
|
|
||||||
};
|
|
||||||
|
|
||||||
depot-replica-key = {
|
|
||||||
file = secretFile "depot-replica-key";
|
|
||||||
mode = "0500";
|
|
||||||
owner = "git";
|
|
||||||
group = "git";
|
|
||||||
path = "/var/lib/git/.ssh/id_ed25519";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Automatically collect garbage from the Nix store.
|
|
||||||
services.depot.automatic-gc = {
|
|
||||||
enable = true;
|
|
||||||
interval = "1 hour";
|
|
||||||
diskThreshold = 200; # GiB
|
|
||||||
maxFreed = 420; # GiB
|
|
||||||
preserveGenerations = "90d";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Run a handful of Buildkite agents to support parallel builds.
|
|
||||||
services.depot.buildkite = {
|
|
||||||
enable = true;
|
|
||||||
agentCount = 32;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Run Nix cache proxy
|
|
||||||
services.depot.builderball.enable = true;
|
|
||||||
|
|
||||||
# Run a Harmonia binary cache.
|
|
||||||
#
|
|
||||||
# TODO(tazjin): switch to upstream module after fix for Nix 2.3
|
|
||||||
services.depot.harmonia = {
|
|
||||||
enable = true;
|
|
||||||
signKeyPaths = [ (config.age.secretsDir + "/nix-cache-priv") ];
|
|
||||||
settings.bind = "127.0.0.1:6443";
|
|
||||||
settings.priority = 50;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.fail2ban.enable = true;
|
|
||||||
|
|
||||||
# Join TVL Tailscale network at net.tvl.fyi
|
|
||||||
services.tailscale = {
|
|
||||||
enable = true;
|
|
||||||
useRoutingFeatures = "server"; # for exit-node usage
|
|
||||||
};
|
|
||||||
|
|
||||||
security.sudo.extraRules = [
|
|
||||||
{
|
|
||||||
groups = [ "wheel" ];
|
|
||||||
commands = [{ command = "ALL"; options = [ "NOPASSWD" ]; }];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
zramSwap.enable = true;
|
|
||||||
|
|
||||||
# Use TVL cache locally through the proxy; for cross-builder substitution.
|
|
||||||
tvl.cache.enable = true;
|
|
||||||
tvl.cache.builderball = true;
|
|
||||||
|
|
||||||
system.stateVersion = "20.03";
|
|
||||||
}
|
|
||||||
|
|
@ -18,7 +18,6 @@ in
|
||||||
description = "Public addresses of caches to use";
|
description = "Public addresses of caches to use";
|
||||||
|
|
||||||
default = [
|
default = [
|
||||||
"whitby.cache.tvl.fyi"
|
|
||||||
"nevsky.cache.tvl.fyi"
|
"nevsky.cache.tvl.fyi"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.ssh.knownHosts = {
|
programs.ssh.knownHosts = {
|
||||||
whitby = {
|
|
||||||
hostNames = [ "whitby.tvl.fyi" "whitby.tvl.su" ];
|
|
||||||
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNh/w4BSKov0jdz3gKBc98tpoLta5bb87fQXWBhAl2I";
|
|
||||||
};
|
|
||||||
|
|
||||||
sanduny = {
|
sanduny = {
|
||||||
hostNames = [ "sanduny.tvl.su" ];
|
hostNames = [ "sanduny.tvl.su" ];
|
||||||
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOag0XhylaTVhmT6HB8EN2Fv5Ymrc4ZfypOXONUkykTX";
|
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOag0XhylaTVhmT6HB8EN2Fv5Ymrc4ZfypOXONUkykTX";
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
nginx = {
|
nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
sslVerify = false;
|
sslVerify = false;
|
||||||
constLabels = [ "host=whitby" ];
|
constLabels = [ "host=${config.networking.hostName}" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
let
|
let
|
||||||
cfg = config.services.gerrit;
|
cfg = config.services.gerrit;
|
||||||
|
|
||||||
besadiiWithConfig = name: pkgs.writeShellScript "besadii-whitby" ''
|
besadiiWithConfig = name: pkgs.writeShellScript "besadii-hook" ''
|
||||||
export BESADII_CONFIG=/run/agenix/gerrit-besadii-config
|
export BESADII_CONFIG=/run/agenix/gerrit-besadii-config
|
||||||
exec -a ${name} ${depot.ops.besadii}/bin/besadii "$@"
|
exec -a ${name} ${depot.ops.besadii}/bin/besadii "$@"
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,9 @@ let
|
||||||
# This attrset forms a linked list of hosts, which delegate ACME fallbacks to
|
# This attrset forms a linked list of hosts, which delegate ACME fallbacks to
|
||||||
# each other. These *must* form a circle, otherwise we may end up walking only
|
# each other. These *must* form a circle, otherwise we may end up walking only
|
||||||
# part of the ring.
|
# part of the ring.
|
||||||
|
#
|
||||||
|
# TODO: remove whitby from here, it is gone; leaving this code for now for
|
||||||
|
# easier discovery when reconfiguring this.
|
||||||
acmeFallback = host: ({
|
acmeFallback = host: ({
|
||||||
whitby = "nevsky.cache.tvl.fyi";
|
whitby = "nevsky.cache.tvl.fyi";
|
||||||
nevsky = "whitby.cache.tvl.fyi"; # GOTO 1
|
nevsky = "whitby.cache.tvl.fyi"; # GOTO 1
|
||||||
|
|
@ -26,7 +29,9 @@ in
|
||||||
# hosts. This config is kind of messy; it would be nice to generate a
|
# hosts. This config is kind of messy; it would be nice to generate a
|
||||||
# correct ring from the depot fixpoint, but this may be impossible due to
|
# correct ring from the depot fixpoint, but this may be impossible due to
|
||||||
# infinite recursion. Please read the comment on `acmeFallback` above.
|
# infinite recursion. Please read the comment on `acmeFallback` above.
|
||||||
acmeFallbackHost = acmeFallback config.networking.hostName;
|
#
|
||||||
|
# TODO: whitby is gone, this is not needed at the moment
|
||||||
|
# acmeFallbackHost = acmeFallback config.networking.hostName;
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
location = /cache-key.pub {
|
location = /cache-key.pub {
|
||||||
|
|
|
||||||
|
|
@ -60,9 +60,8 @@ in rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Systems that should be built in CI
|
# Systems that should be built in CI
|
||||||
whitbySystem = (nixosFor depot.ops.machines.whitby).system;
|
|
||||||
sandunySystem = (nixosFor depot.ops.machines.sanduny).system;
|
sandunySystem = (nixosFor depot.ops.machines.sanduny).system;
|
||||||
bugrySystem = (nixosFor depot.ops.machines.bugry).system;
|
bugrySystem = (nixosFor depot.ops.machines.bugry).system;
|
||||||
nevskySystem = (nixosFor depot.ops.machines.nevsky).system;
|
nevskySystem = (nixosFor depot.ops.machines.nevsky).system;
|
||||||
meta.ci.targets = [ "sandunySystem" "whitbySystem" "bugrySystem" "nevskySystem" ];
|
meta.ci.targets = [ "sandunySystem" "bugrySystem" "nevskySystem" ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ let
|
||||||
nix-build -A ci.gcroot --out-link /nix/var/nix/gcroots/depot/canon
|
nix-build -A ci.gcroot --out-link /nix/var/nix/gcroots/depot/canon
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Ensure that anchoring happens on whitby, so that cache.tvl.su always
|
# Ensure that anchoring happens on nevsky, so that cache.tvl.su always
|
||||||
# has the full cache. Unanchored machines may garbage collect live
|
# has the full cache. Unanchored machines may garbage collect live
|
||||||
# paths.
|
# paths.
|
||||||
agents.hostname = "nevsky";
|
agents.hostname = "nevsky";
|
||||||
|
|
|
||||||
|
|
@ -24,44 +24,43 @@ let
|
||||||
flokli = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTVTXOutUZZjXLB0lUSgeKcSY/8mxKkC0ingGK1whD2 flokli";
|
flokli = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTVTXOutUZZjXLB0lUSgeKcSY/8mxKkC0ingGK1whD2 flokli";
|
||||||
|
|
||||||
sanduny = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOag0XhylaTVhmT6HB8EN2Fv5Ymrc4ZfypOXONUkykTX";
|
sanduny = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOag0XhylaTVhmT6HB8EN2Fv5Ymrc4ZfypOXONUkykTX";
|
||||||
whitby = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNh/w4BSKov0jdz3gKBc98tpoLta5bb87fQXWBhAl2I";
|
|
||||||
nevsky = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQe7M+G8Id3ZD7j+I07TCUV1o12q1vpsOXHRlcPSEfa";
|
nevsky = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQe7M+G8Id3ZD7j+I07TCUV1o12q1vpsOXHRlcPSEfa";
|
||||||
bugry = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGqG6sITyJ/UsQ/RtYqmmMvTT4r4sppadoQIz5SvA+5J";
|
bugry = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGqG6sITyJ/UsQ/RtYqmmMvTT4r4sppadoQIz5SvA+5J";
|
||||||
|
|
||||||
admins = tazjin ++ aspen ++ sterni;
|
admins = tazjin ++ aspen ++ sterni;
|
||||||
allHosts = [ whitby sanduny nevsky bugry ];
|
allHosts = [ sanduny nevsky bugry ];
|
||||||
for = hosts: {
|
for = hosts: {
|
||||||
publicKeys = hosts ++ admins;
|
publicKeys = hosts ++ admins;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
"besadii.age" = for [ whitby nevsky ];
|
"besadii.age" = for [ nevsky ];
|
||||||
"buildkite-agent-token.age" = for [ whitby nevsky ];
|
"buildkite-agent-token.age" = for [ nevsky ];
|
||||||
"buildkite-graphql-token.age" = for [ whitby nevsky ];
|
"buildkite-graphql-token.age" = for [ nevsky ];
|
||||||
"buildkite-ssh-private-key.age" = for [ whitby nevsky ];
|
"buildkite-ssh-private-key.age" = for [ nevsky ];
|
||||||
"clbot-ssh.age" = for [ whitby nevsky ];
|
"clbot-ssh.age" = for [ nevsky ];
|
||||||
"clbot.age" = for [ whitby nevsky ];
|
"clbot.age" = for [ nevsky ];
|
||||||
"depot-inbox-imap.age" = for [ sanduny ];
|
"depot-inbox-imap.age" = for [ sanduny ];
|
||||||
"depot-replica-key.age" = for [ whitby nevsky ];
|
"depot-replica-key.age" = for [ nevsky ];
|
||||||
"gerrit-autosubmit.age" = for [ whitby nevsky ];
|
"gerrit-autosubmit.age" = for [ nevsky ];
|
||||||
"gerrit-secrets.age" = for [ whitby nevsky ];
|
"gerrit-secrets.age" = for [ nevsky ];
|
||||||
"grafana.age" = for [ whitby nevsky ];
|
"grafana.age" = for [ nevsky ];
|
||||||
"irccat.age" = for [ whitby nevsky ];
|
"irccat.age" = for [ nevsky ];
|
||||||
"journaldriver.age" = for allHosts;
|
"journaldriver.age" = for allHosts;
|
||||||
"keycloak-db.age" = for [ whitby nevsky ];
|
"keycloak-db.age" = for [ nevsky ];
|
||||||
"nix-cache-priv.age" = for [ whitby nevsky ];
|
"nix-cache-priv.age" = for [ nevsky ];
|
||||||
"nix-cache-pub.age" = for [ whitby nevsky ];
|
"nix-cache-pub.age" = for [ nevsky ];
|
||||||
"owothia.age" = for [ whitby nevsky ];
|
"owothia.age" = for [ nevsky ];
|
||||||
"panettone.age" = for [ whitby nevsky ];
|
"panettone.age" = for [ nevsky ];
|
||||||
"restic-bugry.age" = for [ bugry ];
|
"restic-bugry.age" = for [ bugry ];
|
||||||
"restic-nevsky.age" = for [ nevsky ];
|
"restic-nevsky.age" = for [ nevsky ];
|
||||||
"restic-sanduny.age" = for [ sanduny ];
|
"restic-sanduny.age" = for [ sanduny ];
|
||||||
"smtprelay.age" = for [ whitby nevsky ];
|
"smtprelay.age" = for [ nevsky ];
|
||||||
"teleirc.age" = for [ whitby nevsky ];
|
"teleirc.age" = for [ nevsky ];
|
||||||
"tf-buildkite.age" = for [ /* humans only */ ];
|
"tf-buildkite.age" = for [ /* humans only */ ];
|
||||||
"tf-glesys.age" = for [ /* humans only */ ];
|
"tf-glesys.age" = for [ /* humans only */ ];
|
||||||
"tf-keycloak.age" = for [ flokli ];
|
"tf-keycloak.age" = for [ flokli ];
|
||||||
"tvl-alerts-bot-telegram-token.age" = for [ whitby nevsky ];
|
"tvl-alerts-bot-telegram-token.age" = for [ nevsky ];
|
||||||
"wg-bugry.age" = for [ bugry ];
|
"wg-bugry.age" = for [ bugry ];
|
||||||
"wg-nevsky.age" = for [ nevsky ];
|
"wg-nevsky.age" = for [ nevsky ];
|
||||||
"yc-restic.age" = for [ nevsky sanduny bugry ];
|
"yc-restic.age" = for [ nevsky sanduny bugry ];
|
||||||
|
|
|
||||||
|
|
@ -675,7 +675,7 @@ given subject an body (in a thread, to avoid blocking)"
|
||||||
(comment
|
(comment
|
||||||
(setq hunchentoot:*catch-errors-p* nil)
|
(setq hunchentoot:*catch-errors-p* nil)
|
||||||
;; to setup an ssh tunnel to cheddar+irccat for development:
|
;; to setup an ssh tunnel to cheddar+irccat for development:
|
||||||
;; ssh -N -L 4238:localhost:4238 -L 4722:localhost:4722 whitby.tvl.fyi
|
;; ssh -N -L 4238:localhost:4238 -L 4722:localhost:4722 nevsky.tvl.fyi
|
||||||
(start-panettone :port 6161
|
(start-panettone :port 6161
|
||||||
:session-secret "session-secret")
|
:session-secret "session-secret")
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue