From 883222a7506b0b93c8f63de09bc408fdc49e6fa9 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 6 Oct 2021 21:56:36 +0200 Subject: [PATCH] matemat: move from c3d2 to serv fixes gitea issue #9 --- host-registry.nix | 2 -- hosts/containers/matemat/default.nix | 15 ++++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/host-registry.nix b/host-registry.nix index fd62ff1a..7b5e1ff3 100644 --- a/host-registry.nix +++ b/host-registry.nix @@ -76,8 +76,6 @@ rec { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMFbxHGfBMBjjior1FNRub56O62K++HVnqUH67BeKD7d"; }; matemat = { - ip4 = "172.22.99.133"; - ip6 = "2a00:8180:2c00:223:f82b:1bff:fedc:8572"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBa07c4NnU1TGX1SMNea9e1d4nMtc0OS4gJLmTA3g/fe"; }; diff --git a/hosts/containers/matemat/default.nix b/hosts/containers/matemat/default.nix index 8b7d69a2..275a4c8c 100644 --- a/hosts/containers/matemat/default.nix +++ b/hosts/containers/matemat/default.nix @@ -1,14 +1,19 @@ -{ lib, pkgs, ... }: +{ hostRegistry, lib, pkgs, ... }: { c3d2 = { isInHq = true; hq.interface = "eth0"; }; - networking = { - hostName = "matemat"; - interfaces.eth0.useDHCP = lib.mkForce true; - firewall.allowedTCPPorts = [ 80 443 ]; + networking.hostName = "matemat"; + networking.useNetworkd = true; + networking.interfaces.eth0 = { + ipv4.addresses = [{ + address = hostRegistry.hosts.matemat.ip4; + prefixLength = 26; + }]; }; + networking.defaultGateway = "172.20.73.1"; + networking.firewall.allowedTCPPorts = [ 80 443 ]; services.yammat.enable = true;