dot

packages and services management
Log | Files | Refs | README

commit a6f3aea178aac81151321387ab88ade2e35fa0d0
parent 17665e9e7291a6f85d8d49afef95b7206509f2d8
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sun, 23 Dec 2018 03:25:53 +0100

wip sslh

Diffstat:
Aetc/pack/sslh/build | 3+++
Aetc/pack/sslh/dependencies/libconfig | 2++
Aetc/pack/sslh/dependencies/libwrap | 2++
Aetc/pack/sslh/homepage | 1+
Aetc/pack/sslh/uri/git | 1+
Aetc/pack/sslh/version | 1+
Metc/s6/host/kuntur/contents | 4++--
Detc/s6/httpd/tcp/run | 13-------------
Detc/s6/httpd/tls/run | 13-------------
Detc/s6/httpd/x/env/ROOT | 1-
Retc/s6/httpd/h-o.st/env/CERTFILE -> etc/s6/httpfile/h-o.st/env/CERTFILE | 0
Retc/s6/httpd/h-o.st/env/KEYFILE -> etc/s6/httpfile/h-o.st/env/KEYFILE | 0
Retc/s6/httpd/tcp/env/PORT -> etc/s6/httpfile/tcp/env/PORT | 0
Aetc/s6/httpfile/tcp/run | 13+++++++++++++
Retc/s6/httpd/tls/env/CERTFILE -> etc/s6/httpfile/tls/env/CERTFILE | 0
Retc/s6/httpd/tls/env/KEYFILE -> etc/s6/httpfile/tls/env/KEYFILE | 0
Retc/s6/httpd/tls/env/PORT -> etc/s6/httpfile/tls/env/PORT | 0
Aetc/s6/httpfile/tls/run | 16++++++++++++++++
Aetc/s6/httpfile/x/env/ACCESSFILE | 1+
Retc/s6/httpd/x/env/BIND -> etc/s6/httpfile/x/env/BIND | 0
Aetc/s6/httpfile/x/env/ROOT | 1+
Retc/s6/httpd/x/env/USER -> etc/s6/httpfile/x/env/USER | 0
Aetc/s6/httpfile/x/setup | 7+++++++
Retc/s6/httpd/x/type -> etc/s6/httpfile/x/type | 0
24 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/etc/pack/sslh/build b/etc/pack/sslh/build @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +make PREFIX="$PREFIX" install diff --git a/etc/pack/sslh/dependencies/libconfig b/etc/pack/sslh/dependencies/libconfig @@ -0,0 +1 @@ +../../libconfig/version+ \ No newline at end of file diff --git a/etc/pack/sslh/dependencies/libwrap b/etc/pack/sslh/dependencies/libwrap @@ -0,0 +1 @@ +../../libwrap/version+ \ No newline at end of file diff --git a/etc/pack/sslh/homepage b/etc/pack/sslh/homepage @@ -0,0 +1 @@ +https://www.rutschle.net/tech/sslh/README.html diff --git a/etc/pack/sslh/uri/git b/etc/pack/sslh/uri/git @@ -0,0 +1 @@ +git://github.com/yrutschle/sslh diff --git a/etc/pack/sslh/version b/etc/pack/sslh/version @@ -0,0 +1 @@ +git diff --git a/etc/s6/host/kuntur/contents b/etc/s6/host/kuntur/contents @@ -1,8 +1,8 @@ geomyidae,ipv4,x geomyidae,ipv6,x git-daemon,x -httpd,tcp,x -httpd,tls,h-o.st,x +httpfile,tcp,x +httpfile,tls,h-o.st,x qmail-smtpd,tcp,josuah.net,x qmail-smtpd,tls,josuah.net,x tinysshd,x diff --git a/etc/s6/httpd/tcp/run b/etc/s6/httpd/tcp/run @@ -1,13 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 -s6-envdir env - -multisubstitute { - importas BIND BIND - importas PORT PORT - importas USER USER -} - -s6-envuidgid ${USER} -s6-tcpserver -vD -b50 -c100 ${BIND} ${PORT} -httpd diff --git a/etc/s6/httpd/tls/run b/etc/s6/httpd/tls/run @@ -1,13 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 -s6-envdir env - -multisubstitute { - importas BIND BIND - importas PORT PORT - importas USER USER -} - -s6-envuidgid ${USER} -s6-tlsserver -vD -b50 -c100 ${BIND} ${PORT} -httpd diff --git a/etc/s6/httpd/x/env/ROOT b/etc/s6/httpd/x/env/ROOT @@ -1 +0,0 @@ -/var/www diff --git a/etc/s6/httpd/h-o.st/env/CERTFILE b/etc/s6/httpfile/h-o.st/env/CERTFILE diff --git a/etc/s6/httpd/h-o.st/env/KEYFILE b/etc/s6/httpfile/h-o.st/env/KEYFILE diff --git a/etc/s6/httpd/tcp/env/PORT b/etc/s6/httpfile/tcp/env/PORT diff --git a/etc/s6/httpfile/tcp/run b/etc/s6/httpfile/tcp/run @@ -0,0 +1,13 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + +multisubstitute { + importas BIND BIND + importas PORT PORT + importas USER USER +} + +s6-envuidgid $USER +s6-tcpserver -vD -b50 -c100 $BIND $PORT +httpfile-httpd diff --git a/etc/s6/httpd/tls/env/CERTFILE b/etc/s6/httpfile/tls/env/CERTFILE diff --git a/etc/s6/httpd/tls/env/KEYFILE b/etc/s6/httpfile/tls/env/KEYFILE diff --git a/etc/s6/httpd/tls/env/PORT b/etc/s6/httpfile/tls/env/PORT diff --git a/etc/s6/httpfile/tls/run b/etc/s6/httpfile/tls/run @@ -0,0 +1,16 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env + +multisubstitute { + importas ACCESSFILE ACCESSFILE + importas BIND BIND + importas PORT PORT + importas USER USER +} + +s6-envuidgid $USER +unexport ACCESSFILE +s6-tlsserver -vD -b50 -c100 $BIND $PORT +export ACCESSFILE $ACCESSFILE +httpfile-httpd diff --git a/etc/s6/httpfile/x/env/ACCESSFILE b/etc/s6/httpfile/x/env/ACCESSFILE @@ -0,0 +1 @@ +/var/www/access.cdb diff --git a/etc/s6/httpd/x/env/BIND b/etc/s6/httpfile/x/env/BIND diff --git a/etc/s6/httpfile/x/env/ROOT b/etc/s6/httpfile/x/env/ROOT @@ -0,0 +1 @@ +/var/httpfile diff --git a/etc/s6/httpd/x/env/USER b/etc/s6/httpfile/x/env/USER diff --git a/etc/s6/httpfile/x/setup b/etc/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/etc/s6/httpd/x/type b/etc/s6/httpfile/x/type