bundles/macbook/files/pyenv

@@ -2,8 +2,6 @@
 
 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"

bundles/network/metadata.py

@@ -50,7 +50,7 @@ def units(metadata):
                 },
                 'Network': {
                     'DHCP': network_conf.get('dhcp', 'no'),
-                    'IPv6AcceptRA': network_conf.get('IPv6AcceptRA', 'no'),
+                    'IPv6AcceptRA': network_conf.get('dhcp', 'no'),
                     'VLAN': set(
                         other_network_name
                             for other_network_name, other_network_conf in metadata.get('network', {}).items()

bundles/pppoe/metadata.py

@@ -26,23 +26,16 @@ defaults = {
             'qdisc-ppp0.service': {
                 'Unit': {
                     'Description': 'setup queuing discipline for interface ppp0',
-                    'After': {
+                    'After': 'sys-devices-virtual-net-ppp0.device',
-                        '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 37Mbit internet besteffort triple-isolate nat egress memlimit 256mb',
+                    'ExecStart': '/sbin/tc qdisc replace root dev ppp0 cake bandwidth 30Mbit rtt 50ms diffserv4 nat egress',
-                    # - 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': 'multi-user.target',
+                    'WantedBy': 'network-online.target',
                 },
             }
         },

nodes/home.router.py

@@ -71,9 +71,6 @@
                 'ipv4': {
                     'ip_forward': 1,
                 },
-                'ipv6': {
-                    'ip_forward': 1,
-                },
             },
         },
         'wireguard': {