dot

packages and services management
Log | Files | Refs | README

commit 06ea7887ce4d132445dd7c92609ad98d24954419
parent 0f9500d62fb9b7db97fe93abb17f53a8b5c22f86
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sat, 20 Oct 2018 14:46:53 +0200

update httpfile to match acme-client

Diffstat:
Rs6/acme-client-snooze/env/BASEDIR -> s6/acme-client-snooze/env/WWDIR | 0
Ms6/acme-client-snooze/run | 6+++---
Ms6/httpfile-tls/env/CERTFILE | 2+-
Ms6/httpfile-tls/env/KEYFILE | 2+-
Ms6/httpfile-tls/run | 4++--
5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/s6/acme-client-snooze/env/BASEDIR b/s6/acme-client-snooze/env/WWDIR diff --git a/s6/acme-client-snooze/run b/s6/acme-client-snooze/run @@ -5,12 +5,12 @@ fdmove -c 2 1 s6-envdir env multisubstitute { importas -n AGREEMENT_URL AGREEMENT_URL - importas -n BASEDIR BASEDIR + importas -n WWWDIR WWWDIR importas -n SSLDIR SSLDIR importas -n DOMAIN DOMAIN } -if { mkdir -p ${BASEDIR}/${DOMAIN}/:well-known/acme-challenge } +if { mkdir -p ${WWWDIR}/${DOMAIN}/:well-known/acme-challenge } if { mkdir -p ${SSLDIR}/${DOMAIN} } if { mkdir -p ${SSLDIR}/private } if { chmod 700 ${SSLDIR}/private } @@ -18,7 +18,7 @@ if { chmod 700 ${SSLDIR}/private } snooze -d1 acme-client -vnN -a $AGREEMENT_URL - -C ${BASEDIR}/${DOMAIN}/:well-known/acme-challenge + -C ${WWWDIR}/${DOMAIN}/:well-known/acme-challenge -c ${SSLDIR}/${DOMAIN} -k ${SSLDIR}/${DOMAIN}/privkey.pem -f ${SSLDIR}/private/privkey.pem diff --git a/s6/httpfile-tls/env/CERTFILE b/s6/httpfile-tls/env/CERTFILE @@ -1 +1 @@ -data/cert.pem +/etc/ssl/josuah.net/cert.pem diff --git a/s6/httpfile-tls/env/KEYFILE b/s6/httpfile-tls/env/KEYFILE @@ -1 +1 @@ -data/cert.key +/etc/ssl/josuah.net/privkey.pem diff --git a/s6/httpfile-tls/run b/s6/httpfile-tls/run @@ -1,11 +1,11 @@ #!/usr/bin/env execlineb fdmove -c 2 1 -s6-envdir env importas ACCESSFILE ACCESSFILE +s6-envdir env importas -n ACCESSFILE ACCESSFILE s6-envuidgid www unexport ACCESSFILE s6-tlsserver -vD -b50 -c100 0.0.0.0 443 export ACCESSFILE $ACCESSFILE -httpfile-httpd /var/www/ +httpfile-httpd