1
0

Update from master 2023-12-21T02:03+00:00

This commit is contained in:
Flake Update Bot 2023-12-21 03:03:02 +01:00
commit f84cac37ca

View File

@ -34,6 +34,14 @@
id = 7;
interface = "enp1s0";
};
networking.vlans."enp3s0.7" = {
id = 7;
interface = "enp3s0";
};
networking.bridges."net-dsl".interfaces = [
"enp1s0.7"
"enp3s0.7"
];
## LTE-Uplink
networking.vlans."enp1s0.102" = {
id = 102;
@ -44,12 +52,16 @@
id = 201;
interface = "enp1s0";
};
networking.interfaces."enp1s0.201".ipv6.addresses = [
networking.bridges."net-heimnetz".interfaces = [
"enp1s0.201"
"enp2s0"
];
networking.interfaces."net-heimnetz".ipv6.addresses = [
{ address = "fe80::1"; prefixLength = 64; }
{ address = "fd00:152:152:4::1"; prefixLength = 64; }
{ address = "2001:4cd8:100:1337::1"; prefixLength = 64; } # public IPs for local network
];
networking.interfaces."enp1s0.201".ipv4.addresses = [
networking.interfaces."net-heimnetz".ipv4.addresses = [
{ address = "10.152.4.1"; prefixLength = 24; }
];
## Gastnetz
@ -72,6 +84,7 @@
networking.interfaces."enp1s0.204".ipv4.addresses = [
{ address = "10.152.33.1"; prefixLength = 24; }
];
# Use Anycast Nameservers
networking.nameservers = [ "fd00:152:152::1" "10.152.0.1" ];
@ -85,7 +98,7 @@
services.radvd.enable = true;
services.radvd.config = ''
interface enp1s0.201 {
interface net-heimnetz {
AdvSendAdvert on;
prefix 2001:4cd8:100:1337::/64 {};
RDNSS fd00:152:152::1 {};
@ -102,7 +115,7 @@
enable = true;
settings = {
interfaces-config = {
interfaces = [ "enp1s0.201" "enp1s0.202" "enp1s0.204" ];
interfaces = [ "net-heimnetz" "enp1s0.202" "enp1s0.204" ];
service-sockets-max-retries = 15;
service-sockets-retry-wait-time = 2000;
};
@ -258,7 +271,7 @@
enable = true;
peers.ntvdsl = {
config = ''
plugin rp-pppoe.so enp1s0.7
plugin pppoe.so net-dsl
user "dsl-31997-001#regio@bsa-vdsl"
ifname ppp-ntvdsl
persist