CCCHH/nix-infra
CCCHH/nix-infra
2
3
Fork 3
Code Issues Pull requests 2 Projects Wiki Activity

Clean up networking configs by making them all use the same layout

Browse source 
Also use the v6 gateway as a nameserver as well for the esphome host.
This commit is contained in:
June 2024-07-30 01:17:05 +02:00
parent e88982d7c7
commit b30015fee1
Signed by: june
SSH key fingerprint: SHA256:o9EAq4Y9N9K0pBQeBTqhSDrND5E7oB+60ZNx0U1yPe0
15 changed files with 162 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/hosts/audio-hauptraum-kueche/networking.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ ... }:
{
networking = {
@ -11,10 +11,9 @@
];
};
defaultGateway = "10.31.210.1";
nameservers = [
"10.31.210.1"
];
nameservers = [ "10.31.210.1" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "1E:EF:2D:92:81:DA";
linkConfig.Name = "net0";

7
config/hosts/audio-hauptraum-tafel/networking.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ ... }:
{
networking = {
@ -11,10 +11,9 @@
];
};
defaultGateway = "10.31.210.1";
nameservers = [
"10.31.210.1"
];
nameservers = [ "10.31.210.1" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "D2:10:33:B1:72:C3";
linkConfig.Name = "net0";

13
config/hosts/eh22-wiki/networking.nix
View file

@ -1,10 +1,8 @@
# Sources for this configuration:
# - https://nixos.wiki/wiki/Networking
{ ... }:
{
networking.interfaces.net0 = {
networking = {
interfaces.net0 = {
ipv4.addresses = [
{
address = "172.31.17.159";
@ -12,9 +10,10 @@
}
];
};
networking.defaultGateway = "172.31.17.129";
networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
networking.search = [ "hamburg.ccc.de" ];
defaultGateway = "172.31.17.129";
nameservers = [ "212.12.50.158" "192.76.134.90" ];
search = [ "hamburg.ccc.de" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "BC:24:11:37:F0:AB";

15
config/hosts/esphome/networking.nix
View file

@ -1,19 +1,14 @@
{ ... }:
{
networking.interfaces.net0 = {
networking = {
interfaces.net0 = {
ipv4.addresses = [
{
address = "10.31.208.24";
prefixLength = 23;
}
];
};
networking.defaultGateway = "10.31.208.1";
networking.nameservers = [ "10.31.208.1" ];
networking.search = [ "z9.ccchh.net" ];
networking.interfaces.net0 = {
ipv6.addresses = [
{
address = "2a07:c480:0:1d0::66";
@ -21,7 +16,11 @@
}
];
};
networking.defaultGateway6 = "2a07:c480:0:1d0::1";
defaultGateway = "10.31.208.1";
defaultGateway6 = "2a07:c480:0:1d0::1";
nameservers = [ "10.31.208.1" "2a07:c480:0:1d0::1" ];
search = [ "z9.ccchh.net" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "7E:3C:F0:77:8A:F4";

12
config/hosts/forgejo-actions-runner/networking.nix
View file

@ -1,7 +1,8 @@
{ config, pkgs, ... }:
{ ... }:
{
networking.interfaces.net0 = {
networking = {
interfaces.net0 = {
ipv4.addresses = [
{
address = "172.31.17.155";
@ -9,9 +10,10 @@
}
];
};
networking.defaultGateway = "172.31.17.129";
networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
networking.search = [ "hamburg.ccc.de" ];
defaultGateway = "172.31.17.129";
nameservers = [ "212.12.50.158" "192.76.134.90" ];
search = [ "hamburg.ccc.de" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "1E:E0:4E:D0:DA:BE";

15
config/hosts/git/networking.nix
View file

@ -4,19 +4,14 @@
{ ... }:
{
networking.interfaces.net0 = {
networking = {
interfaces.net0 = {
ipv4.addresses = [
{
address = "212.12.51.136";
prefixLength = 28;
}
];
};
networking.defaultGateway = "212.12.51.129";
networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
networking.search = [ "hamburg.ccc.de" ];
networking.interfaces.net0 = {
ipv6.addresses = [
{
address = "2a00:14b0:f000:23:51:136::1";
@ -24,7 +19,11 @@
}
];
};
networking.defaultGateway6 = "2a00:14b0:f000:23::1";
defaultGateway = "212.12.51.129";
defaultGateway6 = "2a00:14b0:f000:23::1";
nameservers = [ "212.12.50.158" "192.76.134.90" ];
search = [ "hamburg.ccc.de" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "92:7B:E6:12:A4:FA";

10
config/hosts/matrix/networking.nix
View file

@ -1,7 +1,8 @@
{ ... }:
{
networking.interfaces.net0 = {
networking = {
interfaces.net0 = {
ipv4.addresses = [
{
address = "172.31.17.150";
@ -9,9 +10,10 @@
}
];
};
networking.defaultGateway = "172.31.17.129";
networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
networking.search = [ "hamburg.ccc.de" ];
defaultGateway = "172.31.17.129";
nameservers = [ "212.12.50.158" "192.76.134.90" ];
search = [ "hamburg.ccc.de" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "2A:A5:80:C3:8E:32";

10
config/hosts/mjolnir/networking.nix
View file

@ -1,7 +1,8 @@
{ ... }:
{
networking.interfaces.net0 = {
networking = {
interfaces.net0 = {
ipv4.addresses = [
{
address = "172.31.17.161";
@ -9,9 +10,10 @@
}
];
};
networking.defaultGateway = "172.31.17.129";
networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
networking.search = [ "hamburg.ccc.de" ];
defaultGateway = "172.31.17.129";
nameservers = [ "212.12.50.158" "192.76.134.90" ];
search = [ "hamburg.ccc.de" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "BC:24:11:C9:F8:C5";

13
config/hosts/mqtt/networking.nix
View file

@ -3,16 +3,17 @@
{
networking = {
interfaces.net0 = {
ipv4.addresses = [ {
ipv4.addresses = [
{
address = "10.31.208.14";
prefixLength = 23;
} ];
};
defaultGateway = "10.31.208.1";
nameservers = [
"10.31.210.1"
}
];
};
defaultGateway = "10.31.208.1";
nameservers = [ "10.31.210.1" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "BC:24:11:48:85:73";
linkConfig.Name = "net0";

18
config/hosts/netbox/networking.nix
View file

@ -1,13 +1,8 @@
# Networking configuration for the host.
# Sources for this configuration:
# - https://nixos.org/manual/nixos/stable/#sec-networking
# - https://nixos.wiki/wiki/Systemd-networkd
# - https://wiki.archlinux.org/title/Systemd-networkd
{ config, pkgs, ... }:
{ ... }:
{
networking.interfaces.net0 = {
networking = {
interfaces.net0 = {
ipv4.addresses = [
{
address = "172.31.17.149";
@ -15,9 +10,10 @@
}
];
};
networking.defaultGateway = "172.31.17.129";
networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
networking.search = [ "hamburg.ccc.de" ];
defaultGateway = "172.31.17.129";
nameservers = [ "212.12.50.158" "192.76.134.90" ];
search = [ "hamburg.ccc.de" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "62:ED:44:20:7C:C1";

14
config/hosts/nix-box-june/networking.nix
View file

@ -1,9 +1,8 @@
# Networking configuration for the host.
{ config, pkgs, ... }:
{ ... }:
{
networking.interfaces.net0 = {
networking = {
interfaces.net0 = {
ipv4.addresses = [
{
address = "172.31.17.158";
@ -11,9 +10,10 @@
}
];
};
networking.defaultGateway = "172.31.17.129";
networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
networking.search = [ "hamburg.ccc.de" ];
defaultGateway = "172.31.17.129";
nameservers = [ "212.12.50.158" "192.76.134.90" ];
search = [ "hamburg.ccc.de" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "BC:24:11:6A:33:5F";

4
config/hosts/ptouch-print-server/networking.nix
View file

@ -11,9 +11,7 @@
];
};
defaultGateway = "10.31.208.1";
nameservers = [
"10.31.208.1"
];
nameservers = [ "10.31.208.1" ];
};
systemd.network.links."10-net0" = {

10
config/hosts/public-web-static/networking.nix
View file

@ -1,7 +1,8 @@
{ ... }:
{
networking.interfaces.net0 = {
networking = {
interfaces.net0 = {
ipv4.addresses = [
{
address = "172.31.17.151";
@ -9,9 +10,10 @@
}
];
};
networking.defaultGateway = "172.31.17.129";
networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
networking.search = [ "hamburg.ccc.de" ];
defaultGateway = "172.31.17.129";
nameservers = [ "212.12.50.158" "192.76.134.90" ];
search = [ "hamburg.ccc.de" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "86:72:08:F6:C0:D6";

13
config/hosts/woodpecker/networking.nix
View file

@ -1,10 +1,8 @@
# Sources for this configuration:
# - https://nixos.wiki/wiki/Networking
{ ... }:
{
networking.interfaces.net0 = {
networking = {
interfaces.net0 = {
ipv4.addresses = [
{
address = "172.31.17.160";
@ -12,9 +10,10 @@
}
];
};
networking.defaultGateway = "172.31.17.129";
networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
networking.search = [ "hamburg.ccc.de" ];
defaultGateway = "172.31.17.129";
nameservers = [ "212.12.50.158" "192.76.134.90" ];
search = [ "hamburg.ccc.de" ];
};
systemd.network.links."10-net0" = {
matchConfig.MACAddress = "BC:24:11:5F:A9:B7";

2
config/hosts/yate/networking.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ ... }:
{
networking = {