dot

packages and services management
Log | Files | Refs | README

commit d3a4b6deb69dc74fee6f194b2abf8e6fd6ed3adc
parent f507ac7a5115ddc2c4732cdf8cfdb7097c3985a4
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sat, 17 Nov 2018 10:15:23 +0100

in-place changes that works

Diffstat:
Mbin/service-log | 5++---
Mbin/service-reload | 2+-
Mbin/service-restart | 6+++---
Mbin/service-start | 4++--
Mbin/service-status | 4++--
Mbin/service-stop | 4++--
As6/acme-client/git.josuah.net/env/DOMAIN | 1+
As6/acme-client/irc.josuah.net/env/DOMAIN | 1+
As6/acme-client/www.josuah.net/env/DOMAIN | 1+
Ds6/httpfile-tcp/x/Makefile | 2--
Ds6/httpfile-tls/x/Makefile | 2--
Ds6/httpfile-tls/x/env/ACCESSFILE | 1-
Ds6/httpfile-tls/x/env/HOST | 1-
Ds6/httpfile-tls/x/env/PORT | 1-
Ds6/httpfile-tls/x/env/ROOT | 1-
Rs6/httpfile-tls/josuah.net/env/CERTFILE -> s6/httpfile/josuah.net/env/CERTFILE | 0
Rs6/httpfile-tls/josuah.net/env/KEYFILE -> s6/httpfile/josuah.net/env/KEYFILE | 0
Rs6/httpfile-tcp/x/env/PORT -> s6/httpfile/tcp/env/PORT | 0
Rs6/httpfile-tcp/x/run -> s6/httpfile/tcp/run | 0
Rs6/httpfile-tls/x/env/CERTFILE -> s6/httpfile/tls/env/CERTFILE | 0
Rs6/httpfile-tls/x/env/KEYFILE -> s6/httpfile/tls/env/KEYFILE | 0
As6/httpfile/tls/env/PORT | 1+
Rs6/httpfile-tls/x/run -> s6/httpfile/tls/run | 0
Rs6/httpfile-tcp/x/env/ACCESSFILE -> s6/httpfile/x/env/ACCESSFILE | 0
Rs6/httpfile-tcp/x/env/HOST -> s6/httpfile/x/env/HOST | 0
Rs6/httpfile-tcp/x/env/ROOT -> s6/httpfile/x/env/ROOT | 0
Rs6/httpfile-tcp/x/env/USER -> s6/httpfile/x/env/USER | 0
As6/httpfile/x/setup | 7+++++++
Rs6/httpfile-tcp/x/type -> s6/httpfile/x/type | 0
Ds6/ii-tls/x/env/HOST | 1-
Ds6/ii-tls/x/env/NAME | 0
Ds6/ii-tls/x/env/NICK | 0
Ds6/ii-tls/x/env/PASS | 0
Ds6/ii-tls/x/env/USER | 0
Ds6/ii-tls/x/type | 1-
Rs6/ii-tls/irc.cyberia.is/env/HOST -> s6/ii/irc.cyberia.is/env/HOST | 0
Rs6/ii-tls/irc.cyberia.is/env/NAME -> s6/ii/irc.cyberia.is/env/NAME | 0
Rs6/ii-tls/irc.cyberia.is/env/NICK -> s6/ii/irc.cyberia.is/env/NICK | 0
Rs6/ii-tls/irc.cyberia.is/env/PASS -> s6/ii/irc.cyberia.is/env/PASS | 0
Rs6/ii-tls/irc.cyberia.is/env/USER -> s6/ii/irc.cyberia.is/env/USER | 0
Rs6/ii-tls/irc.freenode.net/env/HOST -> s6/ii/irc.freenode.net/env/HOST | 0
Rs6/ii-tls/irc.freenode.net/env/NAME -> s6/ii/irc.freenode.net/env/NAME | 0
Rs6/ii-tls/irc.freenode.net/env/NICK -> s6/ii/irc.freenode.net/env/NICK | 0
Rs6/ii-tls/irc.freenode.net/env/PASS -> s6/ii/irc.freenode.net/env/PASS | 0
Rs6/ii-tls/irc.freenode.net/env/USER -> s6/ii/irc.freenode.net/env/USER | 0
Rs6/ii-tls/irc.oftc.net/env/HOST -> s6/ii/irc.oftc.net/env/HOST | 0
Rs6/ii-tls/irc.oftc.net/env/NAME -> s6/ii/irc.oftc.net/env/NAME | 0
Rs6/ii-tls/irc.oftc.net/env/NICK -> s6/ii/irc.oftc.net/env/NICK | 0
Rs6/ii-tls/irc.oftc.net/env/PASS -> s6/ii/irc.oftc.net/env/PASS | 0
Rs6/ii-tls/irc.oftc.net/env/USER -> s6/ii/irc.oftc.net/env/USER | 0
As6/ii/tcp/env/PORT | 1+
Rs6/ii-tcp/x/run -> s6/ii/tcp/run | 0
Rs6/ii-tls/x/env/CAFILE -> s6/ii/tls/env/CAFILE | 0
Rs6/ii-tls/x/env/PORT -> s6/ii/tls/env/PORT | 0
Rs6/ii-tls/x/run -> s6/ii/tls/run | 0
Rs6/ii-tls/x/finish -> s6/ii/x/finish | 0
Rs6/httpfile-tls/x/type -> s6/ii/x/type | 0
Ms6/ngircd/josuah.net/conf/SSL/CertFile | 2+-
Ms6/ngircd/x/conf/Global/Ports | 2+-
59 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/bin/service-log b/bin/service-log @@ -1,6 +1,5 @@ #!/usr/bin/env execlineb cd /var/log - -backtick @ { pipeline { dollarat } tr / - } importas -sn @ @ -pipeline { tail -f ${@}/current } s6-tai64nlocal +backtick x { dollarat -n -d - } importas x x +pipeline { tail -f ${x}/current } s6-tai64nlocal diff --git a/bin/service-reload b/bin/service-reload @@ -1,4 +1,4 @@ #!/usr/bin/env execlineb -forbacktickx -n x { pipeline { dollarat } tr / - } importas x x +backtick x { dollarat -n -d - } importas x x s6-svc -h /run/s6/$x diff --git a/bin/service-restart b/bin/service-restart @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -backtick -n @ { pipeline { dollarat } tr / - } importas @ @ -if { service-stop $@ } -if { service-start $@ } +backtick x { dollarat -n -d - } importas x x +if { service-stop $x } +if { service-start $x } diff --git a/bin/service-start b/bin/service-start @@ -1,4 +1,4 @@ #!/usr/bin/env execlineb -backtick -n @ { pipeline { dollarat } tr / - } importas @ @ -s6-rc -l /var/s6/.s6-rc/live -u change $@ +backtick x { dollarat -n -d - } importas x x +s6-rc -l /var/s6/.s6-rc/live -u change $x diff --git a/bin/service-status b/bin/service-status @@ -1,4 +1,4 @@ #!/usr/bin/env execlineb -backtick -n @ { pipeline { dollarat } tr / - } importas @ @ -s6-rc -l /var/s6/.s6-rc/live listall $@ +backtick x { dollarat -n -d - } importas x x +s6-rc -l /var/s6/.s6-rc/live listall $x diff --git a/bin/service-stop b/bin/service-stop @@ -1,4 +1,4 @@ #!/usr/bin/env execlineb -backtick -n @ { pipeline { dollarat } tr / - } importas @ @ -s6-rc -l /var/s6/.s6-rc/live -d change $@ +backtick x { dollarat -n -d - } importas x x +s6-rc -l /var/s6/.s6-rc/live -d change $x diff --git a/s6/acme-client/git.josuah.net/env/DOMAIN b/s6/acme-client/git.josuah.net/env/DOMAIN @@ -0,0 +1 @@ +git.josuah.net diff --git a/s6/acme-client/irc.josuah.net/env/DOMAIN b/s6/acme-client/irc.josuah.net/env/DOMAIN @@ -0,0 +1 @@ +irc.josuah.net diff --git a/s6/acme-client/www.josuah.net/env/DOMAIN b/s6/acme-client/www.josuah.net/env/DOMAIN @@ -0,0 +1 @@ +www.josuah.net diff --git a/s6/httpfile-tcp/x/Makefile b/s6/httpfile-tcp/x/Makefile @@ -1,2 +0,0 @@ -/var/www/access.cdb: /var/www/access.txt - httpfile-access /var/www/access.cdb /var/www/access.tmp </var/www/access.txt diff --git a/s6/httpfile-tls/x/Makefile b/s6/httpfile-tls/x/Makefile @@ -1,2 +0,0 @@ -/var/www/access.cdb: /var/www/access.txt - httpfile-access /var/www/access.cdb /var/www/access.tmp </var/www/access.txt diff --git a/s6/httpfile-tls/x/env/ACCESSFILE b/s6/httpfile-tls/x/env/ACCESSFILE @@ -1 +0,0 @@ -/var/www/access.cdb diff --git a/s6/httpfile-tls/x/env/HOST b/s6/httpfile-tls/x/env/HOST @@ -1 +0,0 @@ -0.0.0.0 diff --git a/s6/httpfile-tls/x/env/PORT b/s6/httpfile-tls/x/env/PORT @@ -1 +0,0 @@ -80 diff --git a/s6/httpfile-tls/x/env/ROOT b/s6/httpfile-tls/x/env/ROOT @@ -1 +0,0 @@ -/var/www diff --git a/s6/httpfile-tls/josuah.net/env/CERTFILE b/s6/httpfile/josuah.net/env/CERTFILE diff --git a/s6/httpfile-tls/josuah.net/env/KEYFILE b/s6/httpfile/josuah.net/env/KEYFILE diff --git a/s6/httpfile-tcp/x/env/PORT b/s6/httpfile/tcp/env/PORT diff --git a/s6/httpfile-tcp/x/run b/s6/httpfile/tcp/run diff --git a/s6/httpfile-tls/x/env/CERTFILE b/s6/httpfile/tls/env/CERTFILE diff --git a/s6/httpfile-tls/x/env/KEYFILE b/s6/httpfile/tls/env/KEYFILE diff --git a/s6/httpfile/tls/env/PORT b/s6/httpfile/tls/env/PORT @@ -0,0 +1 @@ +443 diff --git a/s6/httpfile-tls/x/run b/s6/httpfile/tls/run diff --git a/s6/httpfile-tcp/x/env/ACCESSFILE b/s6/httpfile/x/env/ACCESSFILE diff --git a/s6/httpfile-tcp/x/env/HOST b/s6/httpfile/x/env/HOST diff --git a/s6/httpfile-tcp/x/env/ROOT b/s6/httpfile/x/env/ROOT diff --git a/s6/httpfile-tcp/x/env/USER b/s6/httpfile/x/env/USER diff --git a/s6/httpfile/x/setup b/s6/httpfile/x/setup @@ -0,0 +1,7 @@ +#!/usr/bin/env execlineb +s6-envdir env multisubstitute { + importas ROOT ROOT +} + +redirfd -r 0 ${ROOT}/access.txt +httpfile-access ${ROOT}/access.cdb ${ROOT}/access.tmp diff --git a/s6/httpfile-tcp/x/type b/s6/httpfile/x/type diff --git a/s6/ii-tls/x/env/HOST b/s6/ii-tls/x/env/HOST @@ -1 +0,0 @@ -173.230.128.213 diff --git a/s6/ii-tls/x/env/NAME b/s6/ii-tls/x/env/NAME diff --git a/s6/ii-tls/x/env/NICK b/s6/ii-tls/x/env/NICK diff --git a/s6/ii-tls/x/env/PASS b/s6/ii-tls/x/env/PASS diff --git a/s6/ii-tls/x/env/USER b/s6/ii-tls/x/env/USER diff --git a/s6/ii-tls/x/type b/s6/ii-tls/x/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ii-tls/irc.cyberia.is/env/HOST b/s6/ii/irc.cyberia.is/env/HOST diff --git a/s6/ii-tls/irc.cyberia.is/env/NAME b/s6/ii/irc.cyberia.is/env/NAME diff --git a/s6/ii-tls/irc.cyberia.is/env/NICK b/s6/ii/irc.cyberia.is/env/NICK diff --git a/s6/ii-tls/irc.cyberia.is/env/PASS b/s6/ii/irc.cyberia.is/env/PASS diff --git a/s6/ii-tls/irc.cyberia.is/env/USER b/s6/ii/irc.cyberia.is/env/USER diff --git a/s6/ii-tls/irc.freenode.net/env/HOST b/s6/ii/irc.freenode.net/env/HOST diff --git a/s6/ii-tls/irc.freenode.net/env/NAME b/s6/ii/irc.freenode.net/env/NAME diff --git a/s6/ii-tls/irc.freenode.net/env/NICK b/s6/ii/irc.freenode.net/env/NICK diff --git a/s6/ii-tls/irc.freenode.net/env/PASS b/s6/ii/irc.freenode.net/env/PASS diff --git a/s6/ii-tls/irc.freenode.net/env/USER b/s6/ii/irc.freenode.net/env/USER diff --git a/s6/ii-tls/irc.oftc.net/env/HOST b/s6/ii/irc.oftc.net/env/HOST diff --git a/s6/ii-tls/irc.oftc.net/env/NAME b/s6/ii/irc.oftc.net/env/NAME diff --git a/s6/ii-tls/irc.oftc.net/env/NICK b/s6/ii/irc.oftc.net/env/NICK diff --git a/s6/ii-tls/irc.oftc.net/env/PASS b/s6/ii/irc.oftc.net/env/PASS diff --git a/s6/ii-tls/irc.oftc.net/env/USER b/s6/ii/irc.oftc.net/env/USER diff --git a/s6/ii/tcp/env/PORT b/s6/ii/tcp/env/PORT @@ -0,0 +1 @@ +6667 diff --git a/s6/ii-tcp/x/run b/s6/ii/tcp/run diff --git a/s6/ii-tls/x/env/CAFILE b/s6/ii/tls/env/CAFILE diff --git a/s6/ii-tls/x/env/PORT b/s6/ii/tls/env/PORT diff --git a/s6/ii-tls/x/run b/s6/ii/tls/run diff --git a/s6/ii-tls/x/finish b/s6/ii/x/finish diff --git a/s6/httpfile-tls/x/type b/s6/ii/x/type diff --git a/s6/ngircd/josuah.net/conf/SSL/CertFile b/s6/ngircd/josuah.net/conf/SSL/CertFile @@ -1 +1 @@ -/etc/ssl/josuah.net/cert.pem +/etc/ssl/josuah.net/fullchain.pem diff --git a/s6/ngircd/x/conf/Global/Ports b/s6/ngircd/x/conf/Global/Ports @@ -1 +1 @@ -6697 +6667