dot

packages and services management
Log | Files | Refs | README

commit 68789e025ce0b0f998e40b24e43887b09009f439
parent 6321ed2cfe6b235d710128d6a88679d64d616d58
Author: Josuah Demangeon <mail@josuah.net>
Date:   Fri,  9 Nov 2018 23:15:04 +0100

fix service dirs (god I love doing it)

Diffstat:
Mbin/service-enable | 1-
Rs6/acme-client/josuah.net/env/AGREEMENT_URL -> s6/acme-client/x/env/AGREEMENT_URL | 0
Rs6/acme-client/josuah.net/env/SSLDIR -> s6/acme-client/x/env/SSLDIR | 0
Rs6/acme-client/josuah.net/env/WWDIR -> s6/acme-client/x/env/WWWDIR | 0
Rs6/acme-client/josuah.net/type -> s6/acme-client/x/type | 0
Ms6/httpfile-tcp/x/run | 2+-
Ms6/httpfile-tls/x/run | 2+-
Rs6/qmail-tcp/type -> s6/qmail-tcp/x/type | 0
Ds6/tinysshd/x/data/... | 0
As6/tinysshd/x/env/HOST | 1+
Ms6/tinysshd/x/run | 9+++++----
11 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/service-enable b/bin/service-enable @@ -17,7 +17,6 @@ if { s6-hiercopy /etc/s6/${dir}/x $dst } if { s6-hiercopy /etc/s6/${src} $dst } if { redirfd -w 1 ${dst}/producer-for echo $log } if { redirfd -w 1 ${log}/consumer-for echo $dst } -if { redirfd -w 1 ${log}/pipeline-name echo $dst } if { redirfd -w 1 ${log}/env/SERVICE echo $dst } if { pipeline { echo $dst } sort -u -o ok-all/contents ok-all/contents - } if { pipeline { echo $log } sort -u -o ok-all/contents ok-all/contents - } diff --git a/s6/acme-client/josuah.net/env/AGREEMENT_URL b/s6/acme-client/x/env/AGREEMENT_URL diff --git a/s6/acme-client/josuah.net/env/SSLDIR b/s6/acme-client/x/env/SSLDIR diff --git a/s6/acme-client/josuah.net/env/WWDIR b/s6/acme-client/x/env/WWWDIR diff --git a/s6/acme-client/josuah.net/type b/s6/acme-client/x/type diff --git a/s6/httpfile-tcp/x/run b/s6/httpfile-tcp/x/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 1 +fdmove -c 2 1 s6-envdir env s6-envuidgid www diff --git a/s6/httpfile-tls/x/run b/s6/httpfile-tls/x/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 1 +fdmove -c 2 1 s6-envdir env multisubstitute { importas -n ACCESSFILE ACCESSFILE } diff --git a/s6/qmail-tcp/type b/s6/qmail-tcp/x/type diff --git a/s6/tinysshd/x/data/... b/s6/tinysshd/x/data/... diff --git a/s6/tinysshd/x/env/HOST b/s6/tinysshd/x/env/HOST @@ -0,0 +1 @@ +0.0.0.0 diff --git a/s6/tinysshd/x/run b/s6/tinysshd/x/run @@ -1,11 +1,12 @@ #!/usr/bin/env execlineb fdmove -c 2 1 s6-envdir env multisubstitute { + importas HOST HOST importas PORT PORT } -foreground { if { test ! -d ./data/key/ } tinysshd-makekey ./data/key/ } -foreground { chmod 500 ./data/key/ } +ifelse -n { test -d key } { tinysshd-makekey key } +if { chmod 500 key } -s6-tcpserver 0.0.0.0 $PORT -tinysshd -sovv data/key +s6-tcpserver $HOST $PORT +tinysshd -sovv key