diff --git a/flake.nix b/flake.nix index bdee4ee..643bc0a 100644 --- a/flake.nix +++ b/flake.nix @@ -228,12 +228,6 @@ ]; }; - ustetind = stableNixosConfig "ustetind" { - modules = [ - "${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix" - ]; - }; - brzeczyszczykiewicz = stableNixosConfig "brzeczyszczykiewicz" { modules = [ inputs.grzegorz-clients.nixosModules.grzegorz-webui diff --git a/hosts/ildkule/services/monitoring/prometheus/machines.nix b/hosts/ildkule/services/monitoring/prometheus/machines.nix index 9f6a5c2..0f22fa5 100644 --- a/hosts/ildkule/services/monitoring/prometheus/machines.nix +++ b/hosts/ildkule/services/monitoring/prometheus/machines.nix @@ -27,7 +27,6 @@ in { (mkHostScrapeConfig "lupine-4" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) (mkHostScrapeConfig "lupine-5" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) (mkHostScrapeConfig "temmie" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) - (mkHostScrapeConfig "ustetind" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) (mkHostScrapeConfig "wenche" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) (mkHostScrapeConfig "hildring" [ defaultNodeExporterPort ]) diff --git a/hosts/ustetind/configuration.nix b/hosts/ustetind/configuration.nix deleted file mode 100644 index acbdcda..0000000 --- a/hosts/ustetind/configuration.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ config, fp, pkgs, lib, values, ... }: - -{ - imports = [ - (fp /base) - - ./services/gitea-runners.nix - ]; - - boot.loader.systemd-boot.enable = false; - - networking.useHostResolvConf = lib.mkForce false; - - systemd.network.networks = { - "30-lxc-eth" = values.defaultNetworkConfig // { - matchConfig = { - Type = "ether"; - Kind = "veth"; - Name = [ - "eth*" - ]; - }; - address = with values.hosts.ustetind; [ (ipv4 + "/25") (ipv6 + "/64") ]; - }; - "40-podman-veth" = values.defaultNetworkConfig // { - matchConfig = { - Type = "ether"; - Kind = "veth"; - Name = [ - "veth*" - ]; - }; - DHCP = "yes"; - }; - }; - - # Don't change (even during upgrades) unless you know what you are doing. - # See https://search.nixos.org/options?show=system.stateVersion - system.stateVersion = "24.11"; -} diff --git a/hosts/ustetind/services/gitea-runners.nix b/hosts/ustetind/services/gitea-runners.nix deleted file mode 100644 index a3e8521..0000000 --- a/hosts/ustetind/services/gitea-runners.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, lib, values, ... }: -let - mkRunner = name: { - # This is unfortunately state, and has to be generated one at a time :( - # To do that, comment out all except one of the runners, fill in its token - # inside the sops file, rebuild the system, and only after this runner has - # successfully registered will gitea give you the next token. - # - oysteikt Sep 2023 - sops.secrets."gitea/runners/${name}".restartUnits = [ - "gitea-runner-${name}.service" - ]; - - services.gitea-actions-runner.instances = { - ${name} = { - enable = true; - name = "git-runner-${name}"; url = "https://git.pvv.ntnu.no"; - labels = [ - "debian-latest:docker://node:current-bookworm" - "ubuntu-latest:docker://node:current-bookworm" - ]; - tokenFile = config.sops.secrets."gitea/runners/${name}".path; - }; - }; - }; -in -lib.mkMerge [ - (mkRunner "alpha") - (mkRunner "beta") - (mkRunner "epsilon") - { - virtualisation.podman = { - enable = true; - defaultNetwork.settings.dns_enabled = true; - autoPrune.enable = true; - }; - - networking.dhcpcd.IPv6rs = false; - - networking.firewall.interfaces."podman+".allowedUDPPorts = [53 5353]; - } -] diff --git a/topology/default.nix b/topology/default.nix index b27ccfe..d8b38a7 100644 --- a/topology/default.nix +++ b/topology/default.nix @@ -176,26 +176,6 @@ in { interfaces.ens18.network = "pvv"; }; - nodes.ustetind = { - guestType = "proxmox LXC"; - parent = config.nodes.powerpuff-cluster.id; - - # TODO: the interface name is likely wrong - # interfaceGroups = [ [ "eth0" ] ]; - interfaces.eth0 = { - network = "pvv"; - # mac = ""; - addresses = [ - "129.241.210.234" - "2001:700:300:1900::234" - ]; - gateways = [ - values.hosts.gateway - values.hosts.gateway6 - ]; - }; - }; - ### PVV nodes.ntnu-veggen = mkRouter "NTNU-Veggen" { diff --git a/values.nix b/values.nix index 37dce9a..267ec5d 100644 --- a/values.nix +++ b/values.nix @@ -73,10 +73,6 @@ in rec { ipv4 = pvv-ipv4 233; ipv6 = pvv-ipv6 "4:233"; }; - ustetind = { - ipv4 = pvv-ipv4 234; - ipv6 = pvv-ipv6 234; - }; skrot = { ipv4 = pvv-ipv4 237; ipv6 = pvv-ipv6 237;