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
|
|
@ -18,7 +18,6 @@ in
|
|||
description = "Public addresses of caches to use";
|
||||
|
||||
default = [
|
||||
"whitby.cache.tvl.fyi"
|
||||
"nevsky.cache.tvl.fyi"
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,11 +3,6 @@
|
|||
|
||||
{
|
||||
programs.ssh.knownHosts = {
|
||||
whitby = {
|
||||
hostNames = [ "whitby.tvl.fyi" "whitby.tvl.su" ];
|
||||
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNh/w4BSKov0jdz3gKBc98tpoLta5bb87fQXWBhAl2I";
|
||||
};
|
||||
|
||||
sanduny = {
|
||||
hostNames = [ "sanduny.tvl.su" ];
|
||||
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOag0XhylaTVhmT6HB8EN2Fv5Ymrc4ZfypOXONUkykTX";
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
nginx = {
|
||||
enable = true;
|
||||
sslVerify = false;
|
||||
constLabels = [ "host=whitby" ];
|
||||
constLabels = [ "host=${config.networking.hostName}" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
let
|
||||
cfg = config.services.gerrit;
|
||||
|
||||
besadiiWithConfig = name: pkgs.writeShellScript "besadii-whitby" ''
|
||||
besadiiWithConfig = name: pkgs.writeShellScript "besadii-hook" ''
|
||||
export BESADII_CONFIG=/run/agenix/gerrit-besadii-config
|
||||
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
|
||||
# each other. These *must* form a circle, otherwise we may end up walking only
|
||||
# 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: ({
|
||||
whitby = "nevsky.cache.tvl.fyi";
|
||||
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
|
||||
# correct ring from the depot fixpoint, but this may be impossible due to
|
||||
# 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 = ''
|
||||
location = /cache-key.pub {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue