Remove default env files and use defaults

This commit is contained in:
Alex D. 2023-05-20 16:59:00 +00:00
parent fe01f8d49e
commit 1bfcce5b79
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
145 changed files with 149 additions and 329 deletions

View File

@ -3,8 +3,8 @@
. ../../APKBUILD.template
pkgname=nnd-s6-services
pkgver=2.30
pkgrel=0
pkgver=2.40
pkgrel=1
pkgdesc="Base services for s6"
depends="s6-rc s6-portable-utils s6-linux-utils"
builddir="$srcdir/"

View File

@ -1 +0,0 @@
/etc/bird/bird.conf

View File

@ -1 +0,0 @@
/dev/ceph-00000000-0000-0000-0000-000000000000/osd-block-00000000-0000-0000-0000-000000000000

View File

@ -1 +0,0 @@
0

View File

@ -1 +0,0 @@
https://dn42.burble.com/roa/dn42_roa_46.json

View File

@ -1 +0,0 @@
172.22.12.1/32

View File

@ -1 +0,0 @@
fd42:42:42::2:1/128

View File

@ -1 +0,0 @@
172.22.12.0/24

View File

@ -1 +0,0 @@
fd42:42:42::2:0/120

View File

@ -1 +0,0 @@
500000

View File

@ -1 +0,0 @@
vfat

View File

@ -1 +0,0 @@
rw

View File

@ -1 +0,0 @@
LABEL=nnd-efi

View File

@ -1 +0,0 @@
ext4

View File

@ -1 +0,0 @@
rw

View File

@ -1 +0,0 @@
LABEL=nnd-boot

View File

@ -1 +0,0 @@
pagesize=2M

View File

@ -1 +0,0 @@
nosuid,noexec,nodev

View File

@ -1 +0,0 @@
nosuid,noexec,mode=620,ptmxmode=000

View File

@ -1 +0,0 @@
nosuid,noexec,nodev,inode64

View File

@ -1 +0,0 @@
nosuid,noexec,size=10240k,nr_inodes=2028666,mode=755,inode64

View File

@ -1 +0,0 @@
nosuid,nodev,noexec,hidepid=2

View File

@ -1 +0,0 @@
btrfs

View File

@ -1 +0,0 @@
remount,rw

View File

@ -1 +0,0 @@
none

View File

@ -1 +0,0 @@
nodev,nosuid,size=3259832k,nr_inodes=819200,mode=755,inode64

View File

@ -1 +0,0 @@
nosuid,nodev,noexec

View File

@ -1 +0,0 @@
rw,nosuid,nodev,noexec,relatime,nsdelegate

View File

@ -1 +0,0 @@
nosuid,nodev,noexec

View File

@ -1 +0,0 @@
nosuid,nodev,noexec

View File

@ -1 +0,0 @@
nosuid,nodev,noexec

View File

@ -1 +0,0 @@
nodev,nosuid

View File

@ -1 +0,0 @@
/etc/nnd/nftables/

View File

@ -1 +0,0 @@
/etc/nnd/nftables/loadall

View File

@ -1 +0,0 @@
2.pool.ntp.org

View File

@ -1 +0,0 @@
/etc/radvd/radvd.conf

View File

@ -1 +0,0 @@
/etc/ssh/sshd_config

View File

@ -1 +0,0 @@
1

View File

@ -1 +0,0 @@
nnd-localhost

View File

@ -1 +0,0 @@
1000

View File

@ -1 +0,0 @@
10

View File

@ -1 +0,0 @@
/etc/wireguard/wg-tunnel

View File

@ -1,6 +1,6 @@
#!/bin/execlineb -P
s6-envdir -i /etc/s6/env/bird
importas -i CONFIG CONFIG
s6-envdir -I /etc/s6/env/bird
importas -D /etc/bird/bird.conf CONFIG CONFIG
s6-envdir -i /etc/s6/env/path
emptyenv -p

View File

@ -1,6 +1,6 @@
#!/bin/execlineb -P
s6-envdir -i /etc/s6/env/gortr
importas -i ENDPOINT ENDPOINT
s6-envdir -I /etc/s6/env/gortr
importas -D https://dn42.burble.com/roa/dn42_roa_46.json ENDPOINT ENDPOINT
s6-envdir -i /etc/s6/env/path
emptyenv -p

View File

@ -1,7 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip link del dev $INTERFACE

View File

@ -1,7 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip link add $INTERFACE type wireguard

View File

@ -1,7 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip link set dev $INTERFACE down

View File

@ -1,7 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/path
emptyenv
ip link set dev $INTERFACE up

View File

@ -1,10 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.4
importas -i ADDR ADDR
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip -4 address del $ADDR dev $INTERFACE

View File

@ -1,10 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.4
importas -i ADDR ADDR
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip -4 address add $ADDR dev $INTERFACE

View File

@ -1,10 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.6
importas -i ADDR ADDR
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip -6 address del $ADDR dev $INTERFACE

View File

@ -1,10 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.6
importas -i ADDR ADDR
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip -6 address add $ADDR dev $INTERFACE

View File

@ -1,10 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.4
importas -i ROUTE ROUTE
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip -4 route del $ROUTE dev $INTERFACE

View File

@ -1,10 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.4
importas -i ROUTE ROUTE
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip -4 route add $ROUTE dev $INTERFACE

View File

@ -1,10 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.6
importas -i ROUTE ROUTE
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip -6 route del $ROUTE dev $INTERFACE

View File

@ -1,10 +0,0 @@
#!/bin/execlineb -P
define INTERFACE wg-tunnel
s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.6
importas -i ROUTE ROUTE
s6-envdir -i /etc/s6/env/path
emptyenv -p
ip -6 route add $ROUTE dev $INTERFACE

View File

@ -1,8 +1,8 @@
#!/bin/execlineb -P
define NOTIFYFD 3
s6-envdir -i /etc/s6/env/mdevd
importas -i KBUFSZ KBUFSZ
s6-envdir -I /etc/s6/env/mdevd
importas -D 500000 KBUFSZ KBUFSZ
s6-envdir -i /etc/s6/env/path
emptyenv -p

View File

@ -0,0 +1,4 @@
#!/bin/execlineb -P
export MODULE binfmt_misc
/usr/libexec/nnd/s6/rmmod

View File

@ -0,0 +1,4 @@
#!/bin/execlineb -P
export MODULE binfmt_misc
/usr/libexec/nnd/s6/modprobe

View File

@ -1,6 +1,8 @@
#!/bin/execlineb -P
export SRC LABEL=nnd-efi
export OPTS rw
export FSTYPE vfat
s6-envdir -I /etc/s6/env/mount.boot-efi
export DEST /boot/efi
s6-envdir -i /etc/s6/env/mount.boot-efi
/usr/libexec/nnd/s6/mount

View File

@ -1,6 +1,8 @@
#!/bin/execlineb -P
export SRC LABEL=nnd-boot
export OPTS rw
export FSTYPE ext4
s6-envdir -I /etc/s6/env/mount.boot
export DEST /boot
s6-envdir -i /etc/s6/env/mount.boot
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /dev/hugepages
export OPTS pagesize=2M
export FSTYPE hugetlbfs
s6-envdir -I /etc/s6/env/mount.dev-hugepages
s6-envdir -i /etc/s6/env/mount.dev-hugepages
export DEST /dev/hugepages
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /dev/mqueue
export OPTS nosuid,noexec,nodev
export FSTYPE mqueue
s6-envdir -I /etc/s6/env/mount.dev-mqueue
s6-envdir -i /etc/s6/env/mount.dev-mqueue
export DEST /dev/mqueue
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /dev/pts
export OPTS nosuid,noexec,mode=620,ptmxmode=000
export FSTYPE devpts
s6-envdir -I /etc/s6/env/mount.dev-pts
s6-envdir -i /etc/s6/env/mount.dev-pts
export DEST /dev/pts
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /dev/shm
export OPTS nosuid,noexec,nodev,inode64
export FSTYPE tmpfs
s6-envdir -I /etc/s6/env/mount.dev-shm
s6-envdir -i /etc/s6/env/mount.dev-shm
export DEST /dev/shm
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /dev
export OPTS nosuid,noexec,size=10240k,nr_inodes=2028666,mode=755,inode64
export FSTYPE devtmpfs
s6-envdir -I /etc/s6/env/mount.dev
s6-envdir -i /etc/s6/env/mount.dev
export DEST /dev
/usr/libexec/nnd/s6/mount

View File

@ -0,0 +1,4 @@
#!/bin/execlineb -P
export DEST /proc/sys/fs/binfmt_misc
/usr/libexec/nnd/s6/umount

View File

@ -0,0 +1,7 @@
#!/bin/execlineb -P
export OPTS rw,nosuid,nodev,noexec,relatime
export FSTYPE binfmt_misc
s6-envdir -I /etc/s6/env/mount.proc-sys-fs-binfmt_misc
export DEST /proc/sys/fs/binfmt_misc
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /proc
export OPTS nosuid,nodev,noexec,hidepid=2
export FSTYPE proc
s6-envdir -I /etc/s6/env/mount.proc
s6-envdir -i /etc/s6/env/mount.proc
export DEST /proc
/usr/libexec/nnd/s6/mount

View File

@ -1,6 +1,8 @@
#!/bin/execlineb -P
export SRC LABEL=nnd-root
export OPTS rw
export FSTYPE btrfs
s6-envdir -I /etc/s6/env/mount.root
export DEST /
s6-envdir -i /etc/s6/env/mount.root
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /run
export OPTS nodev,nosuid,size=3259832k,nr_inodes=819200,mode=755,inode64
export FSTYPE tmpfs
s6-envdir -I /etc/s6/env/mount.run
s6-envdir -i /etc/s6/env/mount.run
export DEST /run
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /sys/firmware/efi/efivars
export OPTS nosuid,nodev,noexec
export FSTYPE efivarfs
s6-envdir -I /etc/s6/env/mount.sys-firmware-efi-efivars
s6-envdir -i /etc/s6/env/mount.sys-firmware-efi-efivars
export DEST /sys/firmware/efi/efivars
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /sys/fs/cgroup
export rw,nosuid,nodev,noexec,relatime,nsdelegate
export FSTYPE cgroup2
s6-envdir -I /etc/s6/env/mount.sys-fs-cgroup
s6-envdir -i /etc/s6/env/mount.sys-fs-cgroup
export DEST /sys/fs/cgroup
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /sys/fs/pstore
export OPTS nosuid,nodev,noexec
export FSTYPE pstore
s6-envdir -I /etc/s6/env/mount.sys-fs-pstore
s6-envdir -i /etc/s6/env/mount.sys-fs-pstore
export DEST /sys/fs/pstore
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /sys/kernel/security
export OPTS nosuid,nodev,noexec
export FSTYPE securityfs
s6-envdir -I /etc/s6/env/mount.sys-kernel-security
s6-envdir -i /etc/s6/env/mount.sys-kernel-security
export DEST /sys/kernel/security
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /sys
export OPTS nosuid,nodev,noexec
export FSTYPE sysfs
s6-envdir -I /etc/s6/env/mount.sys
s6-envdir -i /etc/s6/env/mount.sys
export DEST /sys
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
export DEST /tmp
export OPTS nodev,nosuid
export FSTYPE tmpfs
s6-envdir -I /etc/s6/env/mount.tmp
s6-envdir -i /etc/s6/env/mount.tmp
export DEST /tmp
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,6 @@
#!/bin/execlineb -P
export DEST /var/lib/ceph/osd/ceph-0
export FSTYPE tmpfs
s6-envdir -I /etc/s6/env/mount.var-lib-ceph-osd-ceph-0
export DEST /var/lib/ceph/osd/ceph-0
/usr/libexec/nnd/s6/mount

View File

@ -1,7 +1,7 @@
#!/bin/execlineb -P
s6-envdir -i /etc/s6/env/nftables
importas -i RULESET RULESET
importas -i RULEDIR RULEDIR
s6-envdir -I /etc/s6/env/nftables
importas -D /etc/nnd/nftables/loadall RULESET RULESET
importas -D /etc/nnd/nftables/ RULEDIR RULEDIR
s6-envdir -i /etc/s6/env/path
emptyenv -p

View File

@ -1,6 +1,6 @@
#!/bin/execlineb -P
s6-envdir -i /etc/s6/env/ntpd.1
importas -i NTPS NTPS
s6-envdir -I /etc/s6/env/ntpd.1
importas -D 2.pool.ntp.org NTPS NTPS
s6-envdir -i /etc/s6/env/path
emptyenv -p

Some files were not shown because too many files have changed in this diff Show More