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

pppoe

Browse source
This commit is contained in:
CroneKorkN 2025-07-11 23:49:46 +02:00
parent e4e3c57f20
commit cca320e2f4
Signed by: cronekorkn
SSH key fingerprint: SHA256:v0410ZKfuO1QHdgKBsdQNF64xmTxOF8osF1LIqwTcVw
5 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bundles/network/metadata.py
View file

@ -126,6 +126,7 @@ def queuing_disciplines(metadata):
'Service': { 'Service': {
'Type': 'oneshot', 'Type': 'oneshot',
'ExecStart': f'/sbin/tc qdisc replace root dev {network_name} {network_conf["qdisc"]}', 'ExecStart': f'/sbin/tc qdisc replace root dev {network_name} {network_conf["qdisc"]}',
'RemainAfterExit': 'yes',
}, },
'Install': { 'Install': {
'WantedBy': 'network-online.target', 'WantedBy': 'network-online.target',

2
bundles/pppoe/files/isp
View file

@ -6,5 +6,5 @@ persist
maxfail 0 maxfail 0
lcp-echo-interval 20 lcp-echo-interval 20
lcp-echo-failure 3 lcp-echo-failure 3
plugin rp-pppoe.so enp2s0 plugin rp-pppoe.so ${interface}
user "${user}" user "${user}"

6
bundles/pppoe/items.py
View file

@ -7,6 +7,7 @@ files = {
'content_type': 'mako', 'content_type': 'mako',
'mode': '0644', 'mode': '0644',
'context': { 'context': {
'interface': node.metadata.get('pppoe/interface'),
'user': node.metadata.get('pppoe/user'), 'user': node.metadata.get('pppoe/user'),
}, },
'needs': { 'needs': {
@ -33,4 +34,9 @@ svc_systemd = {
'file:/etc/ppp/chap-secrets', 'file:/etc/ppp/chap-secrets',
}, },
}, },
'qdisc-ppp0.service': {
'needs': {
'svc_systemd:pppoe-isp.service',
},
},
} }

16
bundles/pppoe/metadata.py
View file

@ -23,7 +23,21 @@ defaults = {
'RestartSec': 5, 'RestartSec': 5,
}, },
}, },
'qdisc-ppp0.service': {
'Unit': {
'Description': 'setup queuing discipline for interface ppp0',
'After': 'sys-devices-virtual-net-ppp0.device',
'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',
'RemainAfterExit': 'yes',
},
'Install': {
'WantedBy': 'network-online.target',
},
}
}, },
}, },
} }

5
nodes/home.router.py
View file

@ -29,7 +29,9 @@
'dhcp_server': True, 'dhcp_server': True,
}, },
'external': { 'external': {
'interface': 'enp2s0', 'type': 'vlan',
'vlan_interface': 'internal',
'id': 3,
'ipv4': '10.0.98.2/24', 'ipv4': '10.0.98.2/24',
#'qdisc': 'cake bandwidth 35Mbit diffserv4', #'qdisc': 'cake bandwidth 35Mbit diffserv4',
}, },
@ -60,6 +62,7 @@
'hostname': 'home.resolver.name', 'hostname': 'home.resolver.name',
}, },
'pppoe': { 'pppoe': {
'interface': 'external',
'user': '!decrypt:encrypt$gAAAAABocUfodLqCBKPPN7H9S64yJ7kRddtaWI0nQU2oklPMEjBhMsir4NL2yjkcHXAN-Ozqn6FCokyE1AL8ek3c5CqAvd83jkxZytp-oclrKqUD9uhUCy4=', 'user': '!decrypt:encrypt$gAAAAABocUfodLqCBKPPN7H9S64yJ7kRddtaWI0nQU2oklPMEjBhMsir4NL2yjkcHXAN-Ozqn6FCokyE1AL8ek3c5CqAvd83jkxZytp-oclrKqUD9uhUCy4=',
'secret': '!decrypt:encrypt$gAAAAABocUhmDqFZsyHYBIP2qdMFIS1eWT_bPdyv98cHzIgeKFAxDfcCrVJwDxVPFDDMa_7UT76HDJLvtdYQ8mFl2RL0yR8k2A==' 'secret': '!decrypt:encrypt$gAAAAABocUhmDqFZsyHYBIP2qdMFIS1eWT_bPdyv98cHzIgeKFAxDfcCrVJwDxVPFDDMa_7UT76HDJLvtdYQ8mFl2RL0yR8k2A=='
}, },