diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 96a50d8..e1d9ba2 100644 --- a/main/nnd-s6-services/APKBUILD +++ b/main/nnd-s6-services/APKBUILD @@ -3,7 +3,7 @@ . ../../APKBUILD.template pkgname=nnd-s6-services -pkgver=2.13 +pkgver=2.15 pkgrel=0 pkgdesc="Base services for s6" depends="s6-rc s6-portable-utils s6-linux-utils" diff --git a/main/nnd-s6-services/env/bird/CONFIG b/main/nnd-s6-services/env/bird/CONFIG new file mode 100644 index 0000000..0a1a8c4 --- /dev/null +++ b/main/nnd-s6-services/env/bird/CONFIG @@ -0,0 +1 @@ +/etc/bird/bird.conf diff --git a/main/nnd-s6-services/env/gortr/ENDPOINT b/main/nnd-s6-services/env/gortr/ENDPOINT new file mode 100644 index 0000000..3ffc3ea --- /dev/null +++ b/main/nnd-s6-services/env/gortr/ENDPOINT @@ -0,0 +1 @@ +https://dn42.burble.com/roa/dn42_roa_46.json diff --git a/main/nnd-s6-services/env/sysctl.net-ipv4.tcp_l3mdev_accept/VAL b/main/nnd-s6-services/env/sysctl.net-ipv4.tcp_l3mdev_accept/VAL new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/main/nnd-s6-services/env/sysctl.net-ipv4.tcp_l3mdev_accept/VAL @@ -0,0 +1 @@ +1 diff --git a/main/nnd-s6-services/env/sysctl.net-ipv4.udp_l3mdev_accept/VAL b/main/nnd-s6-services/env/sysctl.net-ipv4.udp_l3mdev_accept/VAL new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/main/nnd-s6-services/env/sysctl.net-ipv4.udp_l3mdev_accept/VAL @@ -0,0 +1 @@ +1 diff --git a/main/nnd-s6-services/env/sysctl.net-ipv6-conf-all-keep_addr_on_down/VAL b/main/nnd-s6-services/env/sysctl.net-ipv6-conf-all-keep_addr_on_down/VAL new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/main/nnd-s6-services/env/sysctl.net-ipv6-conf-all-keep_addr_on_down/VAL @@ -0,0 +1 @@ +1 diff --git a/main/nnd-s6-services/env/vrf.vrf-mynet/TABLE b/main/nnd-s6-services/env/vrf.vrf-mynet/TABLE new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/main/nnd-s6-services/env/vrf.vrf-mynet/TABLE @@ -0,0 +1 @@ +10 diff --git a/main/nnd-s6-services/rc/bird/dependencies.d/vrf.vrf-mynet.link b/main/nnd-s6-services/rc/bird/dependencies.d/vrf.vrf-mynet.link new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bird/flag-essential b/main/nnd-s6-services/rc/bird/flag-essential new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bird/producer-for b/main/nnd-s6-services/rc/bird/producer-for new file mode 100644 index 0000000..ea73906 --- /dev/null +++ b/main/nnd-s6-services/rc/bird/producer-for @@ -0,0 +1 @@ +logger.bird diff --git a/main/nnd-s6-services/rc/bird/run b/main/nnd-s6-services/rc/bird/run new file mode 100755 index 0000000..c0281ad --- /dev/null +++ b/main/nnd-s6-services/rc/bird/run @@ -0,0 +1,10 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/bird +importas -i CONFIG CONFIG + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +fdmove -c 2 1 + +bird -c $CONFIG -f diff --git a/main/nnd-s6-services/rc/bird/type b/main/nnd-s6-services/rc/bird/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/bird/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/bridge.br0.eth0/down b/main/nnd-s6-services/rc/bridge.br0.eth0/down index 324cec5..7465f64 100644 --- a/main/nnd-s6-services/rc/bridge.br0.eth0/down +++ b/main/nnd-s6-services/rc/bridge.br0.eth0/down @@ -1,8 +1,7 @@ #!/bin/execlineb -P -define BRINFACE br0 define SLAVEIFACE eth0 s6-envdir -i /etc/s6/env/path emptyenv -p -brctl delif $BRINFACE $SLAVEIFACE +ip link set dev $SLAVEIFACE nomaster diff --git a/main/nnd-s6-services/rc/bridge.br0.eth0/up b/main/nnd-s6-services/rc/bridge.br0.eth0/up index 00e90f7..6186fa6 100644 --- a/main/nnd-s6-services/rc/bridge.br0.eth0/up +++ b/main/nnd-s6-services/rc/bridge.br0.eth0/up @@ -5,4 +5,4 @@ define SLAVEIFACE eth0 s6-envdir -i /etc/s6/env/path emptyenv -p -brctl addif $BRINFACE $SLAVEIFACE +ip link set dev $SLAVEIFACE master $BRINFACE diff --git a/main/nnd-s6-services/rc/bridge.br0/down b/main/nnd-s6-services/rc/bridge.br0/down index 9f5a08c..07e9e15 100644 --- a/main/nnd-s6-services/rc/bridge.br0/down +++ b/main/nnd-s6-services/rc/bridge.br0/down @@ -4,4 +4,4 @@ define INTERFACE br0 s6-envdir -i /etc/s6/env/path emptyenv -p -brctl delbr $INTERFACE +ip link del $INTERFACE diff --git a/main/nnd-s6-services/rc/bridge.br0/up b/main/nnd-s6-services/rc/bridge.br0/up index 94e4bad..0c5bae8 100644 --- a/main/nnd-s6-services/rc/bridge.br0/up +++ b/main/nnd-s6-services/rc/bridge.br0/up @@ -4,4 +4,4 @@ define INTERFACE br0 s6-envdir -i /etc/s6/env/path emptyenv -p -brctl addbr $INTERFACE +ip link add name $INTERFACE type bridge diff --git a/main/nnd-s6-services/rc/gortr/flag-essential b/main/nnd-s6-services/rc/gortr/flag-essential new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/gortr/producer-for b/main/nnd-s6-services/rc/gortr/producer-for new file mode 100644 index 0000000..4e48444 --- /dev/null +++ b/main/nnd-s6-services/rc/gortr/producer-for @@ -0,0 +1 @@ +logger.gortr diff --git a/main/nnd-s6-services/rc/gortr/run b/main/nnd-s6-services/rc/gortr/run new file mode 100755 index 0000000..ddd23a6 --- /dev/null +++ b/main/nnd-s6-services/rc/gortr/run @@ -0,0 +1,10 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/gortr +importas -i ENDPOINT ENDPOINT + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +fdmove -c 2 1 + +gortr -cache $ENDPOINT -refresh 60 -verify=false -checktime=false -bind [::1]:8082 diff --git a/main/nnd-s6-services/rc/gortr/type b/main/nnd-s6-services/rc/gortr/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/gortr/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/logger.bird/consumer-for b/main/nnd-s6-services/rc/logger.bird/consumer-for new file mode 100644 index 0000000..9709804 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.bird/consumer-for @@ -0,0 +1 @@ +bird diff --git a/main/nnd-s6-services/rc/logger.bird/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.bird/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/logger.bird/notification-fd b/main/nnd-s6-services/rc/logger.bird/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.bird/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.bird/run b/main/nnd-s6-services/rc/logger.bird/run new file mode 100755 index 0000000..a2e7239 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.bird/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME bird + +/usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.bird/type b/main/nnd-s6-services/rc/logger.bird/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.bird/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/logger.gortr/consumer-for b/main/nnd-s6-services/rc/logger.gortr/consumer-for new file mode 100644 index 0000000..cc9178a --- /dev/null +++ b/main/nnd-s6-services/rc/logger.gortr/consumer-for @@ -0,0 +1 @@ +gortr diff --git a/main/nnd-s6-services/rc/logger.gortr/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.gortr/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/logger.gortr/notification-fd b/main/nnd-s6-services/rc/logger.gortr/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.gortr/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.gortr/run b/main/nnd-s6-services/rc/logger.gortr/run new file mode 100755 index 0000000..120fffc --- /dev/null +++ b/main/nnd-s6-services/rc/logger.gortr/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME gortr + +/usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.gortr/type b/main/nnd-s6-services/rc/logger.gortr/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.gortr/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/dependencies.d/mount.proc new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/down b/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/down new file mode 100644 index 0000000..fb1b3cf --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/down @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +export SYSCTL net/ipv4/tcp_l3mdev_accept +export VAL 0 + +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/type b/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/up b/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/up new file mode 100644 index 0000000..cdd9008 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/up @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/sysctl.net-ipv4.tcp_l3mdev_accept +export SYSCTL net/ipv4/tcp_l3mdev_accept + +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/dependencies.d/mount.proc new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/down b/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/down new file mode 100644 index 0000000..ce3a7db --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/down @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +export SYSCTL net/ipv4/udp_l3mdev_accept +export VAL 0 + +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/type b/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/up b/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/up new file mode 100644 index 0000000..23769a6 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/up @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/sysctl.net-ipv4.udp_l3mdev_accept +export SYSCTL net/ipv4/udp_l3mdev_accept + +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/dependencies.d/module.ipv6 b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/dependencies.d/module.ipv6 new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/dependencies.d/mount.proc new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/down b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/down new file mode 100644 index 0000000..9d9b464 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/down @@ -0,0 +1,6 @@ +#!/bin/execlineb -P +export SYSCTL net/ipv6/conf/all/keep_addr_on_down + +export VAL 0 + +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/type b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up new file mode 100644 index 0000000..a0f4bdc --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up @@ -0,0 +1,6 @@ +#!/bin/execlineb -P +export SYSCTL net/ipv6/conf/all/keep_addr_on_down + +s6-envdir -i /etc/s6/env/sysctl.net-ipv6-conf-all-keep_addr_on_down + +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/dependencies.d/vrf.vrf-mynet b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/dependencies.d/vrf.vrf-mynet new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/down b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/down new file mode 100644 index 0000000..30b5dc2 --- /dev/null +++ b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/down @@ -0,0 +1,7 @@ +#!/bin/execlineb -P +define INTERFACE vrf-mynet + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +ip link set dev $INTERFACE down diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/type b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/up b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/up new file mode 100644 index 0000000..4b7de04 --- /dev/null +++ b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/up @@ -0,0 +1,7 @@ +#!/bin/execlineb -P +define INTERFACE vrf-mynet + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +ip link set dev $INTERFACE up diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/dependencies.d/vrf.vrf-mynet b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/dependencies.d/vrf.vrf-mynet new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/down b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/down new file mode 100644 index 0000000..e25ada8 --- /dev/null +++ b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/down @@ -0,0 +1,10 @@ +#!/bin/execlineb -P +define INTERFACE vrf-mynet + +s6-envdir -i /etc/s6/env/vrf.${INTERFACE} +importas -i TABLE TABLE + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +ip -6 route del default dev $INTERFACE table $TABLE diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/type b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/up b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/up new file mode 100644 index 0000000..472fb4f --- /dev/null +++ b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/up @@ -0,0 +1,10 @@ +#!/bin/execlineb -P +define INTERFACE vrf-mynet + +s6-envdir -i /etc/s6/env/vrf.${INTERFACE} +importas -i TABLE TABLE + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +ip -6 route add unreachable default metric 4278198272 table $TABLE diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4.tcp_l3mdev_accept b/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4.tcp_l3mdev_accept new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4.udp_l3mdev_accept b/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4.udp_l3mdev_accept new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv6-conf-all-keep_addr_on_down b/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv6-conf-all-keep_addr_on_down new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/down b/main/nnd-s6-services/rc/vrf.vrf-mynet/down new file mode 100644 index 0000000..c343096 --- /dev/null +++ b/main/nnd-s6-services/rc/vrf.vrf-mynet/down @@ -0,0 +1,7 @@ +#!/bin/execlineb -P +define INTERFACE vrf-mynet + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +ip -6 link del $INTERFACE diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/type b/main/nnd-s6-services/rc/vrf.vrf-mynet/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/vrf.vrf-mynet/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/up b/main/nnd-s6-services/rc/vrf.vrf-mynet/up new file mode 100644 index 0000000..5300e7f --- /dev/null +++ b/main/nnd-s6-services/rc/vrf.vrf-mynet/up @@ -0,0 +1,10 @@ +#!/bin/execlineb -P +define INTERFACE vrf-mynet + +s6-envdir -i /etc/s6/env/vrf.${INTERFACE} +importas -i TABLE TABLE + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +ip -6 link add $INTERFACE type vrf table $TABLE