dot

packages and services management
Log | Files | Refs | README

commit 45f2bccb618e2998e900682b24b798d94ff204e8
parent 6fcc8527c31b6e032f251bd606a6063883595472
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sat, 15 Dec 2018 14:02:50 +0100

s6/*/run: sed  some part of the scripts to make them constant

Diffstat:
Ms6/.s6-rc/s6-log/run | 2++
Ms6/.s6-rc/service-log/run | 3+++
Ms6/acme-client/x/run | 3+++
Ms6/axfrdns/x/run | 3+++
Ms6/baresip/x/run | 2++
Ms6/bird/x/run | 2++
Ms6/cherrymusic/x/run | 2++
Ms6/collectd/x/run | 2++
Ms6/curvevpn/client/run | 3+++
Ms6/curvevpn/server/run | 3+++
Ms6/dirmngr/x/run | 2++
Ms6/dnscache/x/run | 3+++
Ms6/ffingerd/x/run | 3+++
Ms6/fossil/x/run | 3+++
Ms6/geomyidae/x/run | 3+++
Ms6/git-daemon/x/run | 3+++
Ms6/git-mirror/snooze/run | 3+++
Ms6/gpg-agent/x/run | 2++
Ms6/httpfile/tcp/run | 3+++
Ms6/httpfile/tls/run | 3+++
Ms6/ii/tcp/run | 3+++
Ms6/ii/tls/run | 3+++
Ms6/kamailio/x/run | 3+++
Ms6/mpop/x/run | 3+++
Ms6/ngircd/x/run | 2++
Ms6/ntpclient/x/run | 3+++
Ms6/opentracker/x/run | 2++
Ms6/pjsua/log/run | 3+++
Ms6/pjsua/x/run | 2++
Ms6/qemu/net-tap/run | 2++
Ms6/qemu/net-user/run | 3+++
Ms6/qmail-pop3d/x/run | 3+++
Ms6/qmail-send/x/run | 3+++
As6/qmail-smtpd/josuah.net/conf/control/rcpthosts | 1+
As6/qmail-smtpd/tcp/env/SERVER | 1+
As6/qmail-smtpd/tls/env/SERVER | 1+
Ds6/qmail-smtpd/tls/run | 11-----------
As6/qmail-smtpd/x/conf/control/badloadertypes | 4++++
As6/qmail-smtpd/x/conf/control/badmailfrom | 5+++++
As6/qmail-smtpd/x/conf/control/badmimetypes | 12++++++++++++
As6/qmail-smtpd/x/conf/control/badrcptto | 4++++
As6/qmail-smtpd/x/conf/control/databytes | 0
As6/qmail-smtpd/x/conf/control/rcpthosts | 0
As6/qmail-smtpd/x/conf/control/timeoutsmtpd | 0
As6/qmail-smtpd/x/run | 17+++++++++++++++++
Ms6/ratox/x/run | 2++
Ms6/sndiod/x/run | 3+++
Ms6/ssh-agent/x/run | 3+++
Ms6/tapio/client/run | 2++
Ms6/tapio/server/run | 3+++
Ms6/tinc/x/run | 2++
Ms6/tinydns/x/run | 3+++
Ms6/tinysshd/x/run | 3+++
Ms6/tor/x/run | 3+++
Ms6/transmission/x/run | 2++
Ms6/u9fs-ssh/x/run | 2++
Ms6/venti/x/run | 3+++
Ms6/vsftpd/x/run | 2++
Ms6/vtund/client/run | 2++
Ms6/vtund/server/run | 2++
Ms6/walldns/x/run | 3++-
Ms6/warp-vpn/client/run | 2++
Ms6/warp-vpn/server/run | 3+++
63 files changed, 177 insertions(+), 12 deletions(-)

diff --git a/s6/.s6-rc/s6-log/run b/s6/.s6-rc/s6-log/run @@ -1,4 +1,6 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + redirfd -rnb 0 /var/s6/.s6-rc/log s6-log -bp t /var/log/s6 diff --git a/s6/.s6-rc/service-log/run b/s6/.s6-rc/service-log/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas SERVICE SERVICE } diff --git a/s6/acme-client/x/run b/s6/acme-client/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas AGREEMENT_URL AGREEMENT_URL importas WWWDIR WWWDIR diff --git a/s6/axfrdns/x/run b/s6/axfrdns/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas USER USER } diff --git a/s6/baresip/x/run b/s6/baresip/x/run @@ -1,3 +1,5 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + baresip -v -f data diff --git a/s6/bird/x/run b/s6/bird/x/run @@ -1,3 +1,5 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + bird -f diff --git a/s6/cherrymusic/x/run b/s6/cherrymusic/x/run @@ -1,4 +1,6 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + python3.6 /pack/src/cherrymusic/cherrymusic diff --git a/s6/collectd/x/run b/s6/collectd/x/run @@ -1,3 +1,5 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + collectd -f -C /etc/collectd/conf diff --git a/s6/curvevpn/client/run b/s6/curvevpn/client/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas NAME NAME importas PUBKEY PUBKEY diff --git a/s6/curvevpn/server/run b/s6/curvevpn/server/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas NAME NAME importas IP IP diff --git a/s6/dirmngr/x/run b/s6/dirmngr/x/run @@ -1,4 +1,6 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + multisubstitute { importas USER USER } diff --git a/s6/dnscache/x/run b/s6/dnscache/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + { importas DATALIMIT DATALIMIT } diff --git a/s6/ffingerd/x/run b/s6/ffingerd/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND importas PORT PORT diff --git a/s6/fossil/x/run b/s6/fossil/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas ROOT ROOT importas PORT_A PORT_A diff --git a/s6/geomyidae/x/run b/s6/geomyidae/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND importas PORT PORT diff --git a/s6/git-daemon/x/run b/s6/git-daemon/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND importas PORT PORT diff --git a/s6/git-mirror/snooze/run b/s6/git-mirror/snooze/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + fdmove -c 1 s6-envdir env multisubstitute { importas GIT GIT diff --git a/s6/gpg-agent/x/run b/s6/gpg-agent/x/run @@ -1,4 +1,6 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + multisubstitute { importas USER USER } diff --git a/s6/httpfile/tcp/run b/s6/httpfile/tcp/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND importas PORT PORT diff --git a/s6/httpfile/tls/run b/s6/httpfile/tls/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas ACCESSFILE ACCESSFILE importas BIND BIND diff --git a/s6/ii/tcp/run b/s6/ii/tcp/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas HOST HOST importas PORT PORT diff --git a/s6/ii/tls/run b/s6/ii/tls/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas HOST HOST importas PORT PORT diff --git a/s6/kamailio/x/run b/s6/kamailio/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND importas MODULES_DIR MODULES_DIR diff --git a/s6/mpop/x/run b/s6/mpop/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas USER USER } diff --git a/s6/ngircd/x/run b/s6/ngircd/x/run @@ -1,3 +1,5 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + ngircd -n -f data/conf diff --git a/s6/ntpclient/x/run b/s6/ntpclient/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND } diff --git a/s6/opentracker/x/run b/s6/opentracker/x/run @@ -1,3 +1,5 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + opentracker -d /var/opentracker diff --git a/s6/pjsua/log/run b/s6/pjsua/log/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas SERVICE SERVICE } diff --git a/s6/pjsua/x/run b/s6/pjsua/x/run @@ -1,3 +1,5 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + pjsua --config-file data/conf diff --git a/s6/qemu/net-tap/run b/s6/qemu/net-tap/run @@ -1,4 +1,6 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + multisubstitute { importas NAME NAME importas MEM MEM diff --git a/s6/qemu/net-user/run b/s6/qemu/net-user/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas NAME NAME importas MEM MEM diff --git a/s6/qmail-pop3d/x/run b/s6/qmail-pop3d/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND importas PORT PORT diff --git a/s6/qmail-send/x/run b/s6/qmail-send/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas MAILDIR MAILDIR } diff --git a/s6/qmail-smtpd/josuah.net/conf/control/rcpthosts b/s6/qmail-smtpd/josuah.net/conf/control/rcpthosts @@ -0,0 +1 @@ +josuah.net diff --git a/s6/qmail-smtpd/tcp/env/SERVER b/s6/qmail-smtpd/tcp/env/SERVER @@ -0,0 +1 @@ +s6-tcpserver diff --git a/s6/qmail-smtpd/tls/env/SERVER b/s6/qmail-smtpd/tls/env/SERVER @@ -0,0 +1 @@ +s6-tlsserver diff --git a/s6/qmail-smtpd/tls/run b/s6/qmail-smtpd/tls/run @@ -1,11 +0,0 @@ -#!/usr/bin/env execlineb -multisubstitute { - importas ACCESSFILE ACCESSFILE - importas USER USER - importas BIND BIND - importas PORT PORT -} - -s6-envuidgid $USER -s6-tlsserver -U $BIND $PORT -qmail-smtpd diff --git a/s6/qmail-smtpd/x/conf/control/badloadertypes b/s6/qmail-smtpd/x/conf/control/badloadertypes @@ -0,0 +1,4 @@ +Mi5kb +MzIuZ +MyLmR +MyLkR diff --git a/s6/qmail-smtpd/x/conf/control/badmailfrom b/s6/qmail-smtpd/x/conf/control/badmailfrom @@ -0,0 +1,5 @@ +# Wildmat evaluates from least specific to most specific +* +! +!*@*.* +*%* diff --git a/s6/qmail-smtpd/x/conf/control/badmimetypes b/s6/qmail-smtpd/x/conf/control/badmimetypes @@ -0,0 +1,12 @@ +TVqQAAMAA +TVpQAAIAA +TVpAALQAc +TVpyAXkAX +TVrmAU4AA +TVrhARwAk +TVoFAQUAA +TVoAAAQAA +TVoIARMAA +TVouARsAA +TVrQAT8AA +TVoAAAEAA diff --git a/s6/qmail-smtpd/x/conf/control/badrcptto b/s6/qmail-smtpd/x/conf/control/badrcptto @@ -0,0 +1,4 @@ +# Wildmat evaluates from least specifc to most specific +*%* +*\ *@* +!*@*.* diff --git a/s6/qmail-smtpd/x/conf/control/databytes b/s6/qmail-smtpd/x/conf/control/databytes diff --git a/s6/qmail-smtpd/x/conf/control/rcpthosts b/s6/qmail-smtpd/x/conf/control/rcpthosts diff --git a/s6/qmail-smtpd/x/conf/control/timeoutsmtpd b/s6/qmail-smtpd/x/conf/control/timeoutsmtpd diff --git a/s6/qmail-smtpd/x/run b/s6/qmail-smtpd/x/run @@ -0,0 +1,17 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + +multisubstitute { + importas USER USER + importas BIND BIND + importas SERVER SERVER + importas PORT PORT + importas -s -d "\n" RBL_REFUSE RBL_REFUSE + importas -s -d "\n" RBL_ACCEPT RBL_ACCEPT +} + +s6-envuidgid ${USER} +${SERVER} -U ${BIND} ${PORT} +rblsmtpd -r${RBL_REFUSE} -a${RBL_ACCEPT} +qmail-smtpd diff --git a/s6/ratox/x/run b/s6/ratox/x/run @@ -1,4 +1,6 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + backtick home { homeof $USER } if { mkdir -p $home/tox } cd $home/tox diff --git a/s6/sndiod/x/run b/s6/sndiod/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND } diff --git a/s6/ssh-agent/x/run b/s6/ssh-agent/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas USER USER } diff --git a/s6/tapio/client/run b/s6/tapio/client/run @@ -1,4 +1,6 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + multisubstitute { importas HOST HOST importas PORT PORT diff --git a/s6/tapio/server/run b/s6/tapio/server/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND importas PORT PORT diff --git a/s6/tinc/x/run b/s6/tinc/x/run @@ -1,3 +1,5 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + tincd -D -d 5 --config=data --pidfile=pid diff --git a/s6/tinydns/x/run b/s6/tinydns/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas USER USER } diff --git a/s6/tinysshd/x/run b/s6/tinysshd/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND importas PORT PORT diff --git a/s6/tor/x/run b/s6/tor/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas USER USER } diff --git a/s6/transmission/x/run b/s6/transmission/x/run @@ -1,3 +1,5 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + transmission-daemon -f -g /var/transmission diff --git a/s6/u9fs-ssh/x/run b/s6/u9fs-ssh/x/run @@ -1,4 +1,6 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + unixserver -v /tmp/9p ssh u9fs@host diff --git a/s6/venti/x/run b/s6/venti/x/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas ROOT ROOT importas PORT_A PORT_A diff --git a/s6/vsftpd/x/run b/s6/vsftpd/x/run @@ -1,3 +1,5 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + vsftpd data/conf diff --git a/s6/vtund/client/run b/s6/vtund/client/run @@ -1,4 +1,6 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + multisubstitute { importas HOST HOST importas SESSION SESSION diff --git a/s6/vtund/server/run b/s6/vtund/server/run @@ -1,3 +1,5 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + vtund -ns -f data/conf diff --git a/s6/walldns/x/run b/s6/walldns/x/run @@ -1,4 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 1 s6-envdir env +fdmove -c 2 1 +s6-envdir env walldns diff --git a/s6/warp-vpn/client/run b/s6/warp-vpn/client/run @@ -1,4 +1,6 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 + multisubstitute { importas HOST HOST importas PORT PORT diff --git a/s6/warp-vpn/server/run b/s6/warp-vpn/server/run @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + multisubstitute { importas BIND BIND importas PORT PORT