Fix samba logging, hopefully finally!

This commit is contained in:
Darren 'Tadgy' Austin 2025-09-22 15:46:15 +00:00
commit 03d8ec939c
6 changed files with 128 additions and 10 deletions

View file

@ -7,10 +7,10 @@ LmdpdGhvb2tzL3Bvc3QtbWVyZ2U= 1757519106 1757519106 root:root 0755 - -
LmdpdGhvb2tzL3ByZS1jb21taXQ= 1757519106 1757519106 root:root 0755 - - LmdpdGhvb2tzL3ByZS1jb21taXQ= 1757519106 1757519106 root:root 0755 - -
LmdpdGlnbm9yZQ== 1758288513 1757593248 root:root 0644 - - LmdpdGlnbm9yZQ== 1758288513 1757593248 root:root 0644 - -
LmdpdG1vZHVsZXM= 1757607701 1757607701 root:root 0644 - - LmdpdG1vZHVsZXM= 1757607701 1757607701 root:root 0644 - -
ZXRjLy5naXRpZ25vcmU= 1758218823 1757611781 root:root 0644 - - ZXRjLy5naXRpZ25vcmU= 1758555751 1757611781 root:root 0644 - -
ZXRjL2FwYWNoZTIvLmdpdGlnbm9yZQ== 1757775950 1757775932 root:root 0644 - - ZXRjL2FwYWNoZTIvLmdpdGlnbm9yZQ== 1757775950 1757775932 root:root 0644 - -
ZXRjL2FwYWNoZTIvaHR0cGQuY29uZg== 1758297527 1757785514 root:root 0644 - - ZXRjL2FwYWNoZTIvaHR0cGQuY29uZg== 1758539420 1757785514 root:root 0644 - -
ZXRjL2FwYWNoZTIvc2l0ZXMuZC9jb3JlLnNsYWNrd2FyZS51ay5uZXQuY29uZg== 1758296215 1757785113 root:root 0644 - - ZXRjL2FwYWNoZTIvc2l0ZXMuZC9jb3JlLnNsYWNrd2FyZS51ay5uZXQuY29uZg== 1758538630 1757785113 root:root 0644 - -
ZXRjL2NvbmYuZC8uZ2l0aWdub3Jl 1758050750 1757609410 root:root 0644 - - ZXRjL2NvbmYuZC8uZ2l0aWdub3Jl 1758050750 1757609410 root:root 0644 - -
ZXRjL2NvbmYuZC9ib290bWlzYw== 1757591865 1757591865 root:root 0644 - - ZXRjL2NvbmYuZC9ib290bWlzYw== 1757591865 1757591865 root:root 0644 - -
ZXRjL2NvbmYuZC9ub2RlLWV4cG9ydGVy 1757592526 1757592526 root:root 0644 - - ZXRjL2NvbmYuZC9ub2RlLWV4cG9ydGVy 1757592526 1757592526 root:root 0644 - -
@ -31,6 +31,9 @@ ZXRjL2RlaHlkcmF0ZWQvaG9va3MvZGVmYXVsdA== 1758045829 1757862077 root:root 0755 -
ZXRjL2dyb3Vw 1757873802 1757869538 root:root 0644 - - ZXRjL2dyb3Vw 1757873802 1757869538 root:root 0644 - -
ZXRjL2hvc3RuYW1l 1757594311 1757594311 root:root 0644 - - ZXRjL2hvc3RuYW1l 1757594311 1757594311 root:root 0644 - -
ZXRjL2hvc3Rz 1757594362 1757594362 root:root 0644 - - ZXRjL2hvc3Rz 1757594362 1757594362 root:root 0644 - -
ZXRjL2luaXQuZC8uZ2l0aWdub3Jl 1758555849 1758555812 root:root 0644 - -
ZXRjL2luaXQuZC9zYW1iYQ== 1758555093 1748355660 root:root 0755 - -
ZXRjL2luaXQuZC90ZXJyYWZvcm0taHR0cC1iYWNrZW5k 1757772166 1757770736 root:root 0755 - -
ZXRjL2lwdGFibGVzL3J1bGVzLXNhdmU= 1757789154 1757789154 root:root 0600 - - ZXRjL2lwdGFibGVzL3J1bGVzLXNhdmU= 1757789154 1757789154 root:root 0600 - -
ZXRjL2lwdGFibGVzL3J1bGVzNi1zYXZl 1757789154 1757789154 root:root 0600 - - ZXRjL2lwdGFibGVzL3J1bGVzNi1zYXZl 1757789154 1757789154 root:root 0600 - -
ZXRjL2tyYjUuY29uZg== 1758214709 1583171707 root:root 0644 - - ZXRjL2tyYjUuY29uZg== 1758214709 1583171707 root:root 0644 - -
@ -76,8 +79,8 @@ ZXRjL3BocDg0L2NvbmYuZC85OV9zeXN2c2htLmluaQ== 1758297192 1758297192 root:root 064
ZXRjL3BocDg0L2NvbmYuZC85OV90aWR5LmluaQ== 1758297192 1758297192 root:root 0644 - - ZXRjL3BocDg0L2NvbmYuZC85OV90aWR5LmluaQ== 1758297192 1758297192 root:root 0644 - -
ZXRjL3BocDg0L3BocC1mcG0uY29uZg== 1758297200 1754432634 root:root 0644 - - ZXRjL3BocDg0L3BocC1mcG0uY29uZg== 1758297200 1754432634 root:root 0644 - -
ZXRjL3BocDg0L3BocC1mcG0uZC93d3cuY29uZg== 1758297200 1754432634 root:root 0644 - - ZXRjL3BocDg0L3BocC1mcG0uZC93d3cuY29uZg== 1758297200 1754432634 root:root 0644 - -
ZXRjL3BocDg0L3BocC5pbmk= 1758374648 1754432634 root:root 0644 - - ZXRjL3BocDg0L3BocC5pbmk= 1758544870 1754432634 root:root 0644 - -
ZXRjL3BrZ2xpc3Q= 1758374426 1757609913 root:root 0644 - - ZXRjL3BrZ2xpc3Q= 1758499200 1757609913 root:root 0644 - -
ZXRjL3B1c2hvdmVyLWNsaWVudC9kZWZhdWx0 1758224985 1758224590 root:root 0600 - - ZXRjL3B1c2hvdmVyLWNsaWVudC9kZWZhdWx0 1758224985 1758224590 root:root 0600 - -
ZXRjL3Jlc29sdi5jb25m 1757611605 1757611605 root:root 0644 - - ZXRjL3Jlc29sdi5jb25m 1757611605 1757611605 root:root 0644 - -
ZXRjL3J1bmxldmVscy9ib290Ly5naXRpZ25vcmU= 1757769666 1757598667 root:root 0644 - - ZXRjL3J1bmxldmVscy9ib290Ly5naXRpZ25vcmU= 1757769666 1757598667 root:root 0644 - -
@ -94,7 +97,7 @@ ZXRjL3J1bmxldmVscy9kZWZhdWx0L3RlcnJhZm9ybS1odHRwLWJhY2tlbmQ= 1757772274 17577722
ZXRjL3J1bmxldmVscy9zaHV0ZG93bi9pcDZ0YWJsZXM= 1757770292 1757770292 root:root 0777 - - ZXRjL3J1bmxldmVscy9zaHV0ZG93bi9pcDZ0YWJsZXM= 1757770292 1757770292 root:root 0777 - -
ZXRjL3J1bmxldmVscy9zaHV0ZG93bi9pcHRhYmxlcw== 1757770284 1757770284 root:root 0777 - - ZXRjL3J1bmxldmVscy9zaHV0ZG93bi9pcHRhYmxlcw== 1757770284 1757770284 root:root 0777 - -
ZXRjL3J1bmxldmVscy9zaHV0ZG93bi9zYW1iYQ== 1757708520 1757708520 root:root 0777 - - ZXRjL3J1bmxldmVscy9zaHV0ZG93bi9zYW1iYQ== 1757708520 1757708520 root:root 0777 - -
ZXRjL3NhbWJhL3NtYi5jb25m 1758378340 1758208516 root:root 0644 - - ZXRjL3NhbWJhL3NtYi5jb25m 1758555660 1758208516 root:root 0644 - -
ZXRjL3NhbWJhL3NtYnVzZXJz 1758121825 1758121586 root:root 0644 - - ZXRjL3NhbWJhL3NtYnVzZXJz 1758121825 1758121586 root:root 0644 - -
ZXRjL3NoYWRvdy5ncGc= 1757599010 1757599010 root:root 0644 - - ZXRjL3NoYWRvdy5ncGc= 1757599010 1757599010 root:root 0644 - -
ZXRjL3NzaC8uZ2l0aWdub3Jl 1757606957 1757606957 root:root 0644 - - ZXRjL3NzaC8uZ2l0aWdub3Jl 1757606957 1757606957 root:root 0644 - -
@ -115,7 +118,7 @@ aG9tZS9zeXNhZG1pbi8ubmFub3Jj 1757585756 1757585756 sysadmin:users 0644 - -
aG9tZS9zeXNhZG1pbi8uc3NoLy5naXRpZ25vcmU= 1757593349 1757593349 sysadmin:users 0644 - - aG9tZS9zeXNhZG1pbi8uc3NoLy5naXRpZ25vcmU= 1757593349 1757593349 sysadmin:users 0644 - -
aG9tZS9zeXNhZG1pbi8uc3NoL2F1dGhvcml6ZWRfa2V5cw== 1757763178 1757587611 sysadmin:users 0644 - - aG9tZS9zeXNhZG1pbi8uc3NoL2F1dGhvcml6ZWRfa2V5cw== 1757763178 1757587611 sysadmin:users 0644 - -
b3B0L3NiaW4vY3JvbmpvYi1kZWh5ZHJhdGVk 1758033093 1757531685 root:root 0755 - - b3B0L3NiaW4vY3JvbmpvYi1kZWh5ZHJhdGVk 1758033093 1757531685 root:root 0755 - -
b3B0L3NiaW4vY3JvbmpvYi1yb3RhdGUtbG9ncy1zeW1saW5rcw== 1758224324 1758224324 root:root 0755 - - b3B0L3NiaW4vY3JvbmpvYi1yb3RhdGUtbG9ncy1zeW1saW5rcw== 1758555302 1758224324 root:root 0755 - -
b3B0L3NiaW4vY3JvbmpvYi11cGRhdGUtcGFja2FnZXMtbGlzdA== 1757531121 1757531121 root:root 0755 - - b3B0L3NiaW4vY3JvbmpvYi11cGRhdGUtcGFja2FnZXMtbGlzdA== 1757531121 1757531121 root:root 0755 - -
b3B0L3NiaW4vY3JvbmpvYi13YXJuLWdpdC1zdGF0dXM= 1758221607 1757591137 root:root 0755 - - b3B0L3NiaW4vY3JvbmpvYi13YXJuLWdpdC1zdGF0dXM= 1758221607 1757591137 root:root 0755 - -
b3B0L3NiaW4vZGVoeWRyYXRlZA== 1757531557 1757531557 root:root 0755 - - b3B0L3NiaW4vZGVoeWRyYXRlZA== 1757531557 1757531557 root:root 0755 - -
@ -125,7 +128,7 @@ cm9vdC8uYmFzaF9sb2dvdXQ= 1757582867 1757582867 root:root 0644 - -
cm9vdC8uYmFzaF9wcm9maWxl 1757584711 1757584711 root:root 0644 - - cm9vdC8uYmFzaF9wcm9maWxl 1757584711 1757584711 root:root 0644 - -
cm9vdC8uYmFzaHJj 1757861289 1757586493 root:root 0644 - - cm9vdC8uYmFzaHJj 1757861289 1757586493 root:root 0644 - -
cm9vdC8uZ2l0Y29uZmln 1757582738 1757582738 root:root 0644 - - cm9vdC8uZ2l0Y29uZmln 1757582738 1757582738 root:root 0644 - -
cm9vdC8uZ2l0aWdub3Jl 1757600312 1757600312 root:root 0644 - - cm9vdC8uZ2l0aWdub3Jl 1758539776 1757600312 root:root 0644 - -
cm9vdC8ubG9jYWwvc2hhcmUvbmFuby8uZ2l0aWdub3Jl 1757586210 1757586210 root:root 0644 - - cm9vdC8ubG9jYWwvc2hhcmUvbmFuby8uZ2l0aWdub3Jl 1757586210 1757586210 root:root 0644 - -
cm9vdC8ubmFub3Jj 1757585756 1757585756 root:root 0644 - - cm9vdC8ubmFub3Jj 1757585756 1757585756 root:root 0644 - -
cm9vdC8uc3NoLy5naXRpZ25vcmU= 1757593349 1757593349 root:root 0644 - - cm9vdC8uc3NoLy5naXRpZ25vcmU= 1757593349 1757593349 root:root 0644 - -

1
etc/.gitignore vendored
View file

@ -10,7 +10,6 @@
/ethertypes /ethertypes
/fstab /fstab
/group- /group-
/init.d/
/inittab /inittab
/inputrc /inputrc
/issue /issue

4
etc/init.d/.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
/*
!/.gitignore
!/samba
!/terraform-http-backend

90
etc/init.d/samba Executable file
View file

@ -0,0 +1,90 @@
#!/sbin/openrc-run
extra_started_commands="reload"
piddir=${piddir:-"/run/samba"}
DAEMON=${RC_SVCNAME#samba.}
if [ "$DAEMON" != "$RC_SVCNAME" ]; then
daemon_list=$DAEMON
fi
depend() {
need net
after firewall
}
start_pre() {
checkpath --directory "$piddir"
}
start_samba() {
start-stop-daemon --start --quiet --exec /usr/sbin/samba -- \
${samba_options:-"-D" "-l" "/var/log/core.slackware.uk.net/today/samba"}
}
stop_samba() {
start-stop-daemon --stop --quiet --pidfile "$piddir"/samba.pid
}
start_smbd() {
start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- \
${smbd_options:-"-D"}
}
stop_smbd() {
start-stop-daemon --stop --quiet --pidfile "$piddir"/smbd.pid
}
start_nmbd() {
start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- \
${nmbd_options:-"-D"}
}
stop_nmbd() {
start-stop-daemon --stop --quiet --pidfile "$piddir"/nmbd.pid
}
start_winbindd() {
start-stop-daemon --start --quiet --exec /usr/sbin/winbindd -- \
${winbindd_options:-"-D"}
}
stop_winbindd() {
start-stop-daemon --stop --quiet --pidfile "$piddir"/winbindd.pid
}
start_bgqd() {
start-stop-daemon --start --quiet --exec /usr/lib/samba/samba-bgqd -- \
${bgqd_options:-"-D"}
}
stop_bgqd() {
start-stop-daemon --stop --quiet --pidfile "$piddir"/samba-bgqd.pid
}
start() {
for i in $daemon_list; do
ebegin "Starting $i"
start_$i
eend $?
done
}
stop() {
for i in $daemon_list; do
ebegin "Stopping $i"
stop_$i
eend $?
done
}
reload() {
for i in $daemon_list; do
ebegin "Reloading $i"
# bgqd binary is called samba-bgqd
busybox killall -HUP ${i/bgqd/samba-bgqd}
eend $?
done
}

View file

@ -0,0 +1,19 @@
#!/sbin/openrc-run
depend() {
need net
after firewall
}
start() {
ebegin "Starting terraform-http-backend"
source /etc/conf.d/terraform-http-backend || eend 1
su "$TF_USER" -c "/opt/sbin/terraform-http-backend &" || eend 1
eend $?
}
stop() {
ebegin "Stopping terraform-http-backend"
busybox killall -TERM terraform-http-backend
eend $?
}

View file

@ -10,8 +10,11 @@ tls cafile = /etc/ssl/certs/ca-certificates.crt
tls certfile = /etc/certificates/core.slackware.uk.net_cert.pem tls certfile = /etc/certificates/core.slackware.uk.net_cert.pem
tls keyfile = /etc/certificates/core.slackware.uk.net_key.pem tls keyfile = /etc/certificates/core.slackware.uk.net_key.pem
tls verify peer = ca_and_name_if_available tls verify peer = ca_and_name_if_available
log level = 1 log level = 2
logging = syslog:local5 logging = syslog:local5
log file = /var/log/core.slackware.uk.net/today/samba/samba
debug syslog format = always
debug hires timestamp = yes
enable core files = no enable core files = no
idmap config * : backend = tdb idmap config * : backend = tdb
# There are only 568 IDs mapped into the container by TrueNAS, so limit the number that can be used. # There are only 568 IDs mapped into the container by TrueNAS, so limit the number that can be used.