cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ipv6_picking #24

Merged
cronekorkn merged 5 commits from ipv6_picking into master 2025-08-09 12:43:09 +02:00
Conversation 0 Commits 5 Files changed 5 +17 -5
5 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundles/macbook/files/pyenv
View file

@ -2,6 +2,8 @@
cd "$OLDPWD" cd "$OLDPWD"
pyenv install --skip-existing
if test -f .venv/bin/python && test "$(realpath .venv/bin/python)" != "$(realpath "$(pyenv which python)")" if test -f .venv/bin/python && test "$(realpath .venv/bin/python)" != "$(realpath "$(pyenv which python)")"
then then
echo "rebuilding venv für new python version" echo "rebuilding venv für new python version"

2
bundles/network/metadata.py
View file

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

13
bundles/pppoe/metadata.py
View file

@ -26,16 +26,23 @@ defaults = {
'qdisc-ppp0.service': { 'qdisc-ppp0.service': {
'Unit': { 'Unit': {
'Description': 'setup queuing discipline for interface ppp0', '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', 'BindsTo': 'sys-devices-virtual-net-ppp0.device',
}, },
'Service': { 'Service': {
'Type': 'oneshot', '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', 'RemainAfterExit': 'yes',
}, },
'Install': { 'Install': {
'WantedBy': 'network-online.target', 'WantedBy': 'multi-user.target',
}, },
} }
}, },

3
nodes/home.router.py
View file

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

2
nodes/ovh.secondary.py
View file

@ -1,7 +1,7 @@
{ {
'hostname': '135.125.239.125', 'hostname': '135.125.239.125',
'groups': [ 'groups': [
'debian-11', 'debian-12',
'dnsserver', 'dnsserver',
'monitored', 'monitored',
], ],