dot

packages and services management
Log | Files | Refs | README

commit cb5b3b906115ae1264df26878be898e37437a8bc
parent be02259b8391b479af6349ebda773104fb1d3628
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sat, 15 Dec 2018 12:49:21 +0100

let service-enable handle the fdmove and envdir

Diffstat:
Apack/ucspi-tcp/build | 6++++++
Apack/ucspi-tcp/homepage | 1+
Apack/ucspi-tcp/uri/0.88 | 1+
Apack/ucspi-tcp/version | 1+
Ms6/.s6-rc/s6-log/run | 1-
Ms6/.s6-rc/service-log/run | 2--
Ms6/acme-client/x/run | 2+-
Ms6/axfrdns/x/run | 2+-
Ms6/baresip/x/run | 1-
Ms6/bird/x/run | 1-
Ms6/cherrymusic/x/run | 1-
Ms6/collectd/x/run | 1-
Ms6/curvevpn/client/run | 2+-
Ms6/curvevpn/server/run | 2+-
Ms6/dirmngr/x/run | 2--
Ms6/dnscache/x/run | 2+-
Ms6/ffingerd/x/run | 2+-
Ms6/fossil/x/run | 2+-
Ms6/geomyidae/x/run | 2+-
Ms6/git-daemon/x/run | 2+-
Ms6/gpg-agent/x/run | 2--
Ms6/httpfile/tcp/run | 2+-
Ms6/httpfile/tls/run | 2+-
Ms6/ii/tcp/run | 2+-
Ms6/ii/tls/run | 2+-
Ms6/kamailio/x/run | 2--
Ms6/mpop/x/run | 2+-
Ms6/ngircd/x/run | 1-
Ms6/ntpclient/x/run | 2+-
Ms6/opentracker/x/run | 1-
Ms6/pjsua/log/run | 2+-
Ms6/qemu/net-tap/run | 2+-
Ms6/qemu/net-user/run | 2+-
Ms6/qmail-pop3d/x/run | 2+-
Ms6/qmail-send/x/run | 2+-
Ms6/qmail-smtpd/tcp/run | 3++-
Ms6/qmail-smtpd/tls/run | 2+-
Ms6/ratox/x/run | 1-
Ms6/sndiod/x/run | 2--
Ms6/ssh-agent/x/run | 2+-
Ms6/tapio/client/run | 2+-
Ms6/tapio/server/run | 2+-
Ms6/tinc/x/run | 1-
Ms6/tinydns/x/run | 2+-
Ms6/tinysshd/x/run | 2+-
Ms6/tor/x/run | 2--
Ms6/transmission/x/run | 1-
Rs6/u9fs-mount/x/run/down -> s6/u9fs-mount/x/down | 0
Rs6/u9fs-mount/x/run/producer-for -> s6/u9fs-mount/x/producer-for | 0
Rs6/u9fs-mount/x/run/type -> s6/u9fs-mount/x/type | 0
Rs6/u9fs-mount/x/run/up -> s6/u9fs-mount/x/up | 0
Ms6/u9fs-ssh/x/run | 1-
Ms6/venti/x/run | 2+-
Ms6/vsftpd/x/run | 1-
Ms6/vtund/client/run | 2+-
Ms6/vtund/server/run | 1-
Ms6/warp-vpn/client/run | 2+-
Ms6/warp-vpn/server/run | 2+-
58 files changed, 41 insertions(+), 56 deletions(-)

diff --git a/pack/ucspi-tcp/build b/pack/ucspi-tcp/build @@ -0,0 +1,6 @@ +#!/bin/sh -e + +echo gcc -O2 -include /usr/include/errno.h >conf-cc +echo "$PREFIX" >conf-home + +make setup diff --git a/pack/ucspi-tcp/homepage b/pack/ucspi-tcp/homepage @@ -0,0 +1 @@ +http://cr.yp.to/ucspi-tcp.html diff --git a/pack/ucspi-tcp/uri/0.88 b/pack/ucspi-tcp/uri/0.88 @@ -0,0 +1 @@ +http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz diff --git a/pack/ucspi-tcp/version b/pack/ucspi-tcp/version @@ -0,0 +1 @@ +0.88 diff --git a/s6/.s6-rc/s6-log/run b/s6/.s6-rc/s6-log/run @@ -1,5 +1,4 @@ #!/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,6 +1,4 @@ #!/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,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas AGREEMENT_URL AGREEMENT_URL importas WWWDIR WWWDIR importas SSLDIR SSLDIR diff --git a/s6/axfrdns/x/run b/s6/axfrdns/x/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas USER USER } diff --git a/s6/baresip/x/run b/s6/baresip/x/run @@ -1,4 +1,3 @@ #!/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,4 +1,3 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 bird -f diff --git a/s6/cherrymusic/x/run b/s6/cherrymusic/x/run @@ -1,5 +1,4 @@ #!/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,4 +1,3 @@ #!/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,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas NAME NAME importas PUBKEY PUBKEY importas IP IP diff --git a/s6/curvevpn/server/run b/s6/curvevpn/server/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas NAME NAME importas IP IP importas PORT PORT diff --git a/s6/dirmngr/x/run b/s6/dirmngr/x/run @@ -1,6 +1,4 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 -s6-envdir env multisubstitute { importas USER USER } diff --git a/s6/dnscache/x/run b/s6/dnscache/x/run @@ -1,5 +1,5 @@ #!/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,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas BIND BIND importas PORT PORT } diff --git a/s6/fossil/x/run b/s6/fossil/x/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas ROOT ROOT importas PORT_A PORT_A importas PORT_H PORT_H diff --git a/s6/geomyidae/x/run b/s6/geomyidae/x/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas BIND BIND importas PORT PORT importas ROOT ROOT diff --git a/s6/git-daemon/x/run b/s6/git-daemon/x/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas BIND BIND importas PORT PORT importas ROOT ROOT diff --git a/s6/gpg-agent/x/run b/s6/gpg-agent/x/run @@ -1,6 +1,4 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 -s6-envdir env multisubstitute { importas USER USER } diff --git a/s6/httpfile/tcp/run b/s6/httpfile/tcp/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas BIND BIND importas PORT PORT importas USER USER diff --git a/s6/httpfile/tls/run b/s6/httpfile/tls/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas ACCESSFILE ACCESSFILE importas BIND BIND importas PORT PORT diff --git a/s6/ii/tcp/run b/s6/ii/tcp/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas HOST HOST importas PORT PORT importas USER USER diff --git a/s6/ii/tls/run b/s6/ii/tls/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas HOST HOST importas PORT PORT importas USER USER diff --git a/s6/kamailio/x/run b/s6/kamailio/x/run @@ -1,6 +1,4 @@ #!/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,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas USER USER } diff --git a/s6/ngircd/x/run b/s6/ngircd/x/run @@ -1,4 +1,3 @@ #!/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,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas BIND BIND } diff --git a/s6/opentracker/x/run b/s6/opentracker/x/run @@ -1,4 +1,3 @@ #!/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,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas SERVICE SERVICE } diff --git a/s6/qemu/net-tap/run b/s6/qemu/net-tap/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas NAME NAME importas MEM MEM importas MAC MAC diff --git a/s6/qemu/net-user/run b/s6/qemu/net-user/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas NAME NAME importas MEM MEM importas MAC MAC diff --git a/s6/qmail-pop3d/x/run b/s6/qmail-pop3d/x/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas BIND BIND importas PORT PORT importas MAILDIR MAILDIR diff --git a/s6/qmail-send/x/run b/s6/qmail-send/x/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas MAILDIR MAILDIR } diff --git a/s6/qmail-smtpd/tcp/run b/s6/qmail-smtpd/tcp/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas USER USER importas BIND BIND importas PORT PORT @@ -7,4 +7,5 @@ fdmove -c 2 1 s6-envdir env multisubstitute { s6-envuidgid $USER s6-tcpserver -U $BIND $PORT +rblsmtpd qmail-smtpd diff --git a/s6/qmail-smtpd/tls/run b/s6/qmail-smtpd/tls/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas ACCESSFILE ACCESSFILE importas USER USER importas BIND BIND diff --git a/s6/ratox/x/run b/s6/ratox/x/run @@ -1,5 +1,4 @@ #!/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,6 +1,4 @@ #!/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,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas USER USER } diff --git a/s6/tapio/client/run b/s6/tapio/client/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas HOST HOST importas PORT PORT importas IFACE IFACE diff --git a/s6/tapio/server/run b/s6/tapio/server/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas BIND BIND importas PORT PORT importas MODE MODE diff --git a/s6/tinc/x/run b/s6/tinc/x/run @@ -1,4 +1,3 @@ #!/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,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas USER USER } diff --git a/s6/tinysshd/x/run b/s6/tinysshd/x/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas BIND BIND importas PORT PORT } diff --git a/s6/tor/x/run b/s6/tor/x/run @@ -1,6 +1,4 @@ #!/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,4 +1,3 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 transmission-daemon -f -g /var/transmission diff --git a/s6/u9fs-mount/x/run/down b/s6/u9fs-mount/x/down diff --git a/s6/u9fs-mount/x/run/producer-for b/s6/u9fs-mount/x/producer-for diff --git a/s6/u9fs-mount/x/run/type b/s6/u9fs-mount/x/type diff --git a/s6/u9fs-mount/x/run/up b/s6/u9fs-mount/x/up diff --git a/s6/u9fs-ssh/x/run b/s6/u9fs-ssh/x/run @@ -1,5 +1,4 @@ #!/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,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas ROOT ROOT importas PORT_A PORT_A importas PORT_H PORT_H diff --git a/s6/vsftpd/x/run b/s6/vsftpd/x/run @@ -1,4 +1,3 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 vsftpd data/conf diff --git a/s6/vtund/client/run b/s6/vtund/client/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas HOST HOST importas SESSION SESSION } diff --git a/s6/vtund/server/run b/s6/vtund/server/run @@ -1,4 +1,3 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 vtund -ns -f data/conf diff --git a/s6/warp-vpn/client/run b/s6/warp-vpn/client/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas HOST HOST importas PORT PORT importas DEVTYPE DEVTYPE diff --git a/s6/warp-vpn/server/run b/s6/warp-vpn/server/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 s6-envdir env multisubstitute { +multisubstitute { importas BIND BIND importas PORT PORT importas DEVTYPE DEVTYPE