s6-mk

services definition for the s6-rc service manager
Log | Files | Refs

commit 4c41174ed1a5ba2f2e67f5e4a332d1a9a40a5714
parent f792ef3bafba4ef4e030cf2690aaad2005f913bf
Author: Josuah Demangeon <mail@josuah.net>
Date:   Mon,  7 Jan 2019 22:59:48 +0100

homogenise the run script style

Diffstat:
Macme-client/default/run | 1-
Malert/default/run | 8++++++++
Maxfrdns/default/run | 1-
Mbird/default/run | 1-
Mcurvevpn/client/run | 1-
Mcurvevpn/server/run | 1-
Mdirmngr/default/run | 2+-
Mdnscache/default/run | 1-
Mffingerd/default/run | 1-
Mfossil/default/run | 1-
Mgeomyidae/default/run | 1-
Mgit-daemon/default/run | 1-
Mgit-mirror/default/run | 1-
Mgpg-agent/default/run | 2+-
Mhttpfile/tcp/run | 1-
Mhttpfile/tls/run | 1-
Mii/tcp/run | 1-
Mii/tls/run | 1-
Mkamailio/default/run | 1-
Mmonit/default/run | 2+-
Mmpop/default/run | 1-
Mntpclient/default/run | 1-
Mpjsua/log/run | 1-
Mqemu/net-tap/run | 2+-
Mqemu/net-user/run | 1-
Mqmail-pop3d/default/run | 1-
Mqmail-send/default/run | 1-
Mqmail-smtpd/default/run | 1-
Mqmail-smtpd/log/run | 5+++--
Mratox/default/run | 2+-
Msndiod/default/run | 1-
Mssh-agent/default/run | 1-
Mtapio/client/run | 2+-
Mtapio/server/run | 1-
Mtinydns/default/run | 1-
Mtinysshd/default/run | 1-
Mtor/default/run | 1-
Mtransmission/default/run | 1+
Mventi/default/run | 1-
Mvtund/client/run | 2+-
Mvtund/server/run | 1-
Mwarp-vpn/client/run | 2+-
Mwarp-vpn/server/run | 1-
43 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/acme-client/default/run b/acme-client/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas AGREEMENT_URL AGREEMENT_URL importas WWWDIR WWWDIR diff --git a/alert/default/run b/alert/default/run @@ -1,2 +1,10 @@ #!/usr/bin/env execlineb +redirfd -c 2 1 +s6-envdir env +multisubstitute { + importas -i root ROOT + importas -i chan CHAN + importas -i server SERVER +} +mkdir -p diff --git a/axfrdns/default/run b/axfrdns/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas USER USER } diff --git a/bird/default/run b/bird/default/run @@ -1,5 +1,4 @@ #!/usr/bin/env execlineb fdmove -c 2 1 - bird -f diff --git a/curvevpn/client/run b/curvevpn/client/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas NAME NAME importas PUBKEY PUBKEY diff --git a/curvevpn/server/run b/curvevpn/server/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas NAME NAME importas IP IP diff --git a/dirmngr/default/run b/dirmngr/default/run @@ -1,6 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 - +s6-envdir env multisubstitute { importas USER USER } diff --git a/dnscache/default/run b/dnscache/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas DATALIMIT DATALIMIT } diff --git a/ffingerd/default/run b/ffingerd/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND importas PORT PORT diff --git a/fossil/default/run b/fossil/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas ROOT ROOT importas PORT_A PORT_A diff --git a/geomyidae/default/run b/geomyidae/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND importas PORT PORT diff --git a/git-daemon/default/run b/git-daemon/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND importas PORT PORT diff --git a/git-mirror/default/run b/git-mirror/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas GITDIR GITDIR } diff --git a/gpg-agent/default/run b/gpg-agent/default/run @@ -1,6 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 - +s6-envdir env multisubstitute { importas USER USER } diff --git a/httpfile/tcp/run b/httpfile/tcp/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND importas PORT PORT diff --git a/httpfile/tls/run b/httpfile/tls/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas ACCESSFILE ACCESSFILE importas BIND BIND diff --git a/ii/tcp/run b/ii/tcp/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas -i host HOST importas -i port PORT diff --git a/ii/tls/run b/ii/tls/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas -i host HOST importas -i port PORT diff --git a/kamailio/default/run b/kamailio/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND importas MODULES_DIR MODULES_DIR diff --git a/monit/default/run b/monit/default/run @@ -1,7 +1,7 @@ #!/usr/bin/env execlineb fdmove -c 2 1 - s6-envdir env + cd data ifte { if { wait -t 300 { } } snooze -H * -M * -S 20 } { exit 1 } diff --git a/mpop/default/run b/mpop/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas USER USER } diff --git a/ntpclient/default/run b/ntpclient/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND } diff --git a/pjsua/log/run b/pjsua/log/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas SERVICE SERVICE } diff --git a/qemu/net-tap/run b/qemu/net-tap/run @@ -1,6 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 - +s6-envdir env multisubstitute { importas NAME NAME importas MEM MEM diff --git a/qemu/net-user/run b/qemu/net-user/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas NAME NAME importas MEM MEM diff --git a/qmail-pop3d/default/run b/qmail-pop3d/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND importas PORT PORT diff --git a/qmail-send/default/run b/qmail-send/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas MAILDIR MAILDIR } diff --git a/qmail-smtpd/default/run b/qmail-smtpd/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas USER USER importas BIND BIND diff --git a/qmail-smtpd/log/run b/qmail-smtpd/log/run @@ -1,8 +1,9 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - -importas SERVICE SERVICE +multisubstitute { + importas SERVICE SERVICE +} s6-log -b -^ +" fatal: " 1 diff --git a/ratox/default/run b/ratox/default/run @@ -1,6 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 - +s6-envdir env multisubstitute { importas USER USER } diff --git a/sndiod/default/run b/sndiod/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND } diff --git a/ssh-agent/default/run b/ssh-agent/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas USER USER } diff --git a/tapio/client/run b/tapio/client/run @@ -1,6 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 - +s6-envdir env multisubstitute { importas HOST HOST importas PORT PORT diff --git a/tapio/server/run b/tapio/server/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND importas PORT PORT diff --git a/tinydns/default/run b/tinydns/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas USER USER } diff --git a/tinysshd/default/run b/tinysshd/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND importas PORT PORT diff --git a/tor/default/run b/tor/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas USER USER } diff --git a/transmission/default/run b/transmission/default/run @@ -1,5 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 +s6-envdir env multisubstitute { importas USER USER } diff --git a/venti/default/run b/venti/default/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas ROOT ROOT importas PORT_A PORT_A diff --git a/vtund/client/run b/vtund/client/run @@ -1,6 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 - +s6-envdir env multisubstitute { importas HOST HOST importas SESSION SESSION diff --git a/vtund/server/run b/vtund/server/run @@ -1,5 +1,4 @@ #!/usr/bin/env execlineb fdmove -c 2 1 - vtund -ns -f data/conf diff --git a/warp-vpn/client/run b/warp-vpn/client/run @@ -1,6 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 - +s6-envdir env multisubstitute { importas HOST HOST importas PORT PORT diff --git a/warp-vpn/server/run b/warp-vpn/server/run @@ -1,7 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env - multisubstitute { importas BIND BIND importas PORT PORT