dot

packages and services management
Log | Files | Refs | README

commit 07e4e66002e5b0495fb59ce63369f23a4477817b
parent d0b73a82faab6c0268e48fb42687e5292e4adf83
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sun,  7 Oct 2018 12:28:59 +0200

update acme-client to latest portable version

Diffstat:
As6/acme-client-log/consumer-for | 1+
As6/acme-client-log/pipeline-name | 1+
As6/acme-client-log/run | 2++
Rs6/ii-tcp-log/type -> s6/acme-client-log/type | 0
As6/acme-client-run/run | 5+++++
Ds6/ii-tcp-log/consumer-for | 1-
Ds6/ii-tcp-log/pipeline-name | 1-
Ds6/ii-tcp-log/run | 2--
Ds6/ii-tcp-run/run | 24------------------------
Rs6/ii-tcp-run/env/HOST -> s6/ii-tcp/env/HOST | 0
Rs6/ii-tcp-run/env/NAME -> s6/ii-tcp/env/NAME | 0
Rs6/ii-tcp-run/env/NICK -> s6/ii-tcp/env/NICK | 0
Rs6/ii-tcp-run/env/PASS -> s6/ii-tcp/env/PASS | 0
Rs6/ii-tcp-run/env/PORT -> s6/ii-tcp/env/PORT | 0
Rs6/ii-tcp-run/env/USER -> s6/ii-tcp/env/USER | 0
Rs6/ii-tcp-run/finish -> s6/ii-tcp/finish | 0
Rs6/ii-tcp-run/producer-for -> s6/ii-tcp/producer-for | 0
As6/ii-tcp/run | 24++++++++++++++++++++++++
Rs6/ii-tcp-run/type -> s6/ii-tcp/type | 0
Ds6/ii-tls-log/consumer-for | 1-
Ds6/ii-tls-log/pipeline-name | 1-
Ds6/ii-tls-log/run | 2--
Ds6/ii-tls-run/type | 1-
Rs6/ii-tls-run/data/.empty -> s6/ii-tls/data/.empty | 0
Rs6/ii-tls-run/env/CAFILE -> s6/ii-tls/env/CAFILE | 0
Rs6/ii-tls-run/env/HOST -> s6/ii-tls/env/HOST | 0
Rs6/ii-tls-run/env/NAME -> s6/ii-tls/env/NAME | 0
Rs6/ii-tls-run/env/NICK -> s6/ii-tls/env/NICK | 0
Rs6/ii-tls-run/env/PASS -> s6/ii-tls/env/PASS | 0
Rs6/ii-tls-run/env/PORT -> s6/ii-tls/env/PORT | 0
Rs6/ii-tls-run/env/USER -> s6/ii-tls/env/USER | 0
Rs6/ii-tls-run/finish -> s6/ii-tls/finish | 0
Rs6/ii-tls-run/producer-for -> s6/ii-tls/producer-for | 0
Rs6/ii-tls-run/run -> s6/ii-tls/run | 0
Rs6/ii-tls-log/type -> s6/ii-tls/type | 0
Ms6/snooze-acme-client-run/data/conf | 13++++++++-----
As6/snooze-acme-client-run/env/DOMAIN | 1+
Ms6/snooze-acme-client-run/run | 9+++++++--
38 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/s6/acme-client-log/consumer-for b/s6/acme-client-log/consumer-for @@ -0,0 +1 @@ +acme-client-run diff --git a/s6/acme-client-log/pipeline-name b/s6/acme-client-log/pipeline-name @@ -0,0 +1 @@ +acme-client diff --git a/s6/acme-client-log/run b/s6/acme-client-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/acme-client diff --git a/s6/ii-tcp-log/type b/s6/acme-client-log/type diff --git a/s6/acme-client-run/run b/s6/acme-client-run/run @@ -0,0 +1,5 @@ +#!/usr/bin/env execlineb + +snooze + +acme-client diff --git a/s6/ii-tcp-log/consumer-for b/s6/ii-tcp-log/consumer-for @@ -1 +0,0 @@ -ii-tcp-run diff --git a/s6/ii-tcp-log/pipeline-name b/s6/ii-tcp-log/pipeline-name @@ -1 +0,0 @@ -ii-tcp diff --git a/s6/ii-tcp-log/run b/s6/ii-tcp-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/ii-tcp diff --git a/s6/ii-tcp-run/run b/s6/ii-tcp-run/run @@ -1,24 +0,0 @@ -#!/usr/bin/env execlineb -# connect to an irc server through ii through tlsserver -fdmove -c 2 1 -s6-envdir env -multisubstitute { - importas HOST HOST - importas PORT PORT - importas USER USER - importas NICK NICK - importas NAME NAME -} - -ifelse -n { test -f ${CAFILE} } { - redirfd -r 0 /dev/null - redirfd -w 1 ${CAFILE} - openssl s_client -showcerts -connect ${HOST}:6697 -} - -s6-setuidgid ${USER} -s6-tcpclient ${HOST} ${PORT} -ii -s ${HOST} - -n ${NICK} - -f ${NAME} - -k PASS diff --git a/s6/ii-tcp-run/env/HOST b/s6/ii-tcp/env/HOST diff --git a/s6/ii-tcp-run/env/NAME b/s6/ii-tcp/env/NAME diff --git a/s6/ii-tcp-run/env/NICK b/s6/ii-tcp/env/NICK diff --git a/s6/ii-tcp-run/env/PASS b/s6/ii-tcp/env/PASS diff --git a/s6/ii-tcp-run/env/PORT b/s6/ii-tcp/env/PORT diff --git a/s6/ii-tcp-run/env/USER b/s6/ii-tcp/env/USER diff --git a/s6/ii-tcp-run/finish b/s6/ii-tcp/finish diff --git a/s6/ii-tcp-run/producer-for b/s6/ii-tcp/producer-for diff --git a/s6/ii-tcp/run b/s6/ii-tcp/run @@ -0,0 +1,24 @@ +#!/usr/bin/env execlineb +# connect to an irc server through ii through tlsserver +fdmove -c 2 1 +s6-envdir env +multisubstitute { + importas HOST HOST + importas PORT PORT + importas USER USER + importas NICK NICK + importas NAME NAME +} + +ifelse -n { test -f $CAFILE } { + redirfd -r 0 /dev/null + redirfd -w 1 $CAFILE + openssl s_client -showcerts -connect $HOST:6697 +} + +s6-setuidgid $USER +s6-tcpclient $HOST $PORT +ii -s $HOST + -n $NICK + -f $NAME + -k PASS diff --git a/s6/ii-tcp-run/type b/s6/ii-tcp/type diff --git a/s6/ii-tls-log/consumer-for b/s6/ii-tls-log/consumer-for @@ -1 +0,0 @@ -ii-tls-run diff --git a/s6/ii-tls-log/pipeline-name b/s6/ii-tls-log/pipeline-name @@ -1 +0,0 @@ -ii-tls diff --git a/s6/ii-tls-log/run b/s6/ii-tls-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/ii-tls diff --git a/s6/ii-tls-run/type b/s6/ii-tls-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ii-tls-run/data/.empty b/s6/ii-tls/data/.empty diff --git a/s6/ii-tls-run/env/CAFILE b/s6/ii-tls/env/CAFILE diff --git a/s6/ii-tls-run/env/HOST b/s6/ii-tls/env/HOST diff --git a/s6/ii-tls-run/env/NAME b/s6/ii-tls/env/NAME diff --git a/s6/ii-tls-run/env/NICK b/s6/ii-tls/env/NICK diff --git a/s6/ii-tls-run/env/PASS b/s6/ii-tls/env/PASS diff --git a/s6/ii-tls-run/env/PORT b/s6/ii-tls/env/PORT diff --git a/s6/ii-tls-run/env/USER b/s6/ii-tls/env/USER diff --git a/s6/ii-tls-run/finish b/s6/ii-tls/finish diff --git a/s6/ii-tls-run/producer-for b/s6/ii-tls/producer-for diff --git a/s6/ii-tls-run/run b/s6/ii-tls/run diff --git a/s6/ii-tls-log/type b/s6/ii-tls/type diff --git a/s6/snooze-acme-client-run/data/conf b/s6/snooze-acme-client-run/data/conf @@ -1,15 +1,18 @@ authority letsencrypt { - api url "https://acme-v01.api.letsencrypt.org/directory" - account key "/etc/acme/letsencrypt-privkey.pem" + api url "https://acme-v01.api.letsencrypt.org/directory" + account key "/etc/acme/letsencrypt-privkey.pem" } authority letsencrypt-staging { - api url "https://acme-staging.api.letsencrypt.org/directory" - account key "/etc/acme/letsencrypt-staging-privkey.pem" + api url "https://acme-staging.api.letsencrypt.org/directory" + account key "/etc/acme/letsencrypt-staging-privkey.pem" } domain josuah.net { - alternative names { mail.josuah.net } + alternative names { + mail.josuah.net + git.josuah.net + } domain key "data/ssl/josuah.net.key" domain certificate "data/ssl/josuah.net.crt" domain full chain certificate "data/ssl/josuah.net.pem" diff --git a/s6/snooze-acme-client-run/env/DOMAIN b/s6/snooze-acme-client-run/env/DOMAIN @@ -0,0 +1 @@ +josuah.net diff --git a/s6/snooze-acme-client-run/run b/s6/snooze-acme-client-run/run @@ -1,6 +1,11 @@ #!/usr/bin/env execlineb fdmove -c 2 1 +s6-envdir env multisubstitute { + importas DOMAIN DOMAIN + importas CHALLENGEDIR CHALLENGEDIR + importas CERTDIR CERTDIR +} -if { mkdir -p /etc/acme /etc/ssl/acme/private /var/www/acme } +if { mkdir -p /var/tls/ } snooze -d1 -acme-client -vnN -f data/conf josuah.net +acme-client -vnN -C $CHALLENGEDIR -c $CERTDIR -f data/conf $DOMAIN