diff --git a/bundles/macbook/files/pyenv b/bundles/macbook/files/pyenv index 7847da9..15fdda0 100644 --- a/bundles/macbook/files/pyenv +++ b/bundles/macbook/files/pyenv @@ -2,6 +2,8 @@ cd "$OLDPWD" +pyenv install --skip-existing + if test -f .venv/bin/python && test "$(realpath .venv/bin/python)" != "$(realpath "$(pyenv which python)")" then echo "rebuilding venv für new python version" diff --git a/bundles/network/metadata.py b/bundles/network/metadata.py index 77a18d5..d9d0d23 100644 --- a/bundles/network/metadata.py +++ b/bundles/network/metadata.py @@ -50,7 +50,7 @@ def units(metadata): }, 'Network': { 'DHCP': network_conf.get('dhcp', 'no'), - 'IPv6AcceptRA': network_conf.get('dhcp', 'no'), + 'IPv6AcceptRA': network_conf.get('IPv6AcceptRA', 'no'), 'VLAN': set( other_network_name for other_network_name, other_network_conf in metadata.get('network', {}).items() diff --git a/bundles/pppoe/metadata.py b/bundles/pppoe/metadata.py index 9073b4d..8a49ff4 100644 --- a/bundles/pppoe/metadata.py +++ b/bundles/pppoe/metadata.py @@ -26,16 +26,23 @@ defaults = { 'qdisc-ppp0.service': { 'Unit': { 'Description': 'setup queuing discipline for interface ppp0', - 'After': 'sys-devices-virtual-net-ppp0.device', + 'After': { + 'pppoe-isp.service', + 'sys-devices-virtual-net-ppp0.device', + }, + 'PartOf': 'pppoe-isp.service', 'BindsTo': 'sys-devices-virtual-net-ppp0.device', }, 'Service': { 'Type': 'oneshot', - 'ExecStart': '/sbin/tc qdisc replace root dev ppp0 cake bandwidth 30Mbit rtt 50ms diffserv4 nat egress', + 'ExecStart': '/sbin/tc qdisc replace root dev ppp0 cake bandwidth 37Mbit internet besteffort triple-isolate nat egress memlimit 256mb', + # - no drops save + # - bis 37MBit keine retries bei: iperf3 --client 49.12.184.229 -t999 -i5 --bidir + #'ExecStart': '/sbin/tc qdisc replace root dev ppp0 cake bandwidth 37Mbit internet besteffort nat egress memlimit 256mb', 'RemainAfterExit': 'yes', }, 'Install': { - 'WantedBy': 'network-online.target', + 'WantedBy': 'multi-user.target', }, } }, diff --git a/nodes/home.router.py b/nodes/home.router.py index 5adff9b..c3eb346 100644 --- a/nodes/home.router.py +++ b/nodes/home.router.py @@ -71,6 +71,9 @@ 'ipv4': { 'ip_forward': 1, }, + 'ipv6': { + 'ip_forward': 1, + }, }, }, 'wireguard': { diff --git a/nodes/ovh.secondary.py b/nodes/ovh.secondary.py index 743271a..c1a63fb 100644 --- a/nodes/ovh.secondary.py +++ b/nodes/ovh.secondary.py @@ -1,7 +1,7 @@ { 'hostname': '135.125.239.125', 'groups': [ - 'debian-11', + 'debian-12', 'dnsserver', 'monitored', ],