dot

packages and services management
Log | Files | Refs | README

commit 1a90241259a4edb133ffbd6cfb9d6baef6d8c1bd
parent 9bfc70aba290ef9f265cd943425f87fa37d70d97
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sun, 22 Jul 2018 11:21:15 +0200

Merge branch 'master' of git.josuah.net:conf

Diffstat:
Ms6/djbdns-axfrdns/run | 2+-
Ms6/git-daemon/run | 2+-
Ms6/gproxy/run | 3++-
Ms6/ii-tls/run | 13++++++-------
Ms6/mpop/run | 8++++----
As6/qmail-pop3d/env/HOST | 1+
As6/qmail-pop3d/env/MAILDIR | 1+
Ms6/qmail-pop3d/run | 8++++++--
Ms6/qmail-start/data/control/defaultdelivery | 2+-
Ms6/ssh-fwd/run | 12++++++++++--
Ms6/tinysshd/run | 2+-
Ms6/tls-server/run | 10+++++-----
12 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/s6/djbdns-axfrdns/run b/s6/djbdns-axfrdns/run @@ -7,5 +7,5 @@ s6-envuidgid dns s6-envdir env s6-softliimt 300000 -tcpserver -vDRHl0 0.0.0.0 53 +s6-tcpserver -vDRHl0 0.0.0.0 53 axrfdns diff --git a/s6/git-daemon/run b/s6/git-daemon/run @@ -3,7 +3,7 @@ fdmove -c 2 1 -tcpserver 0.0.0.0 9418 +s6-tcpserver 0.0.0.0 9418 git daemon --inetd --export-all diff --git a/s6/gproxy/run b/s6/gproxy/run @@ -3,4 +3,5 @@ fdmove -c 2 1 -tcpserver 0.0.0.0 8080 ./data/gproxy <host> +s6-tcpserver 0.0.0.0 8080 +./data/gproxy $HOST diff --git a/s6/ii-tls/run b/s6/ii-tls/run @@ -4,14 +4,13 @@ fdmove -c 2 1 s6-envdir env - multisubstitute { -importas HOST HOST -importas PORT PORT -importas USER USER -importas NICK NICK -importas NAME NAME -importas CAFILE CAFILE + importas HOST HOST + importas PORT PORT + importas USER USER + importas NICK NICK + importas NAME NAME + importas CAFILE CAFILE } ifelse -n { test -f ${CAFILE} } { diff --git a/s6/mpop/run b/s6/mpop/run @@ -4,13 +4,13 @@ fdmove -c 2 1 s6-envdir env - importas USER USER + redirfd -r 0 ./data/mpoprc # it might not be readable as ${USER} -s6-setuidgid ${USER} +s6-setuidgid $USER -backtick -n HOME { homeof ${USER} } +backtick -n HOME { homeof $USER } importas HOME HOME -cd ${HOME} +cd $HOME snooze -M /5 -H * mpop -C /dev/stdin diff --git a/s6/qmail-pop3d/env/HOST b/s6/qmail-pop3d/env/HOST @@ -0,0 +1 @@ +josuah.net diff --git a/s6/qmail-pop3d/env/MAILDIR b/s6/qmail-pop3d/env/MAILDIR @@ -0,0 +1 @@ +./mail/INBOX/ diff --git a/s6/qmail-pop3d/run b/s6/qmail-pop3d/run @@ -3,6 +3,10 @@ fdmove -c 2 1 s6-envdir ./env/ +multisubstitute { + importas HOST HOST + importas MAILDIR MAILDIR +} -s6-tcpserver 0.0.0.0 995 -qmail-popup josuah.net checkpassword qmail-pop3d +s6-tlsserver 0.0.0.0 995 +qmail-popup $HOST checkpassword qmail-pop3d $MAILDIR diff --git a/s6/qmail-start/data/control/defaultdelivery b/s6/qmail-start/data/control/defaultdelivery @@ -1 +1 @@ -./mail/INBOX +./mail/INBOX/ diff --git a/s6/ssh-fwd/run b/s6/ssh-fwd/run @@ -3,5 +3,13 @@ fdmove -c 2 1 -ssh -L <port_local>:<host>:<port_remote> - -n <user>@<host> +s6-envdir ./env/ +multisubstitute { + importas PORT_LOCAL PORT_LOCAL + importas PORT_REMOTE PORT_REMOTE + importas HOST HOST + importas USER USER +} + +ssh -L ${PORT_LOCAL}:${HOST}:${PORT_REMOTE} + -n ${USER}@${HOST} diff --git a/s6/tinysshd/run b/s6/tinysshd/run @@ -10,5 +10,5 @@ foreground { chmod 500 ./data/key/ } s6-envdir ./env/ importas PORT PORT -s6-tcpserver 0.0.0.0 ${PORT} +s6-tcpserver 0.0.0.0 $PORT tinysshd -sovv ./data/key/ diff --git a/s6/tls-server/run b/s6/tls-server/run @@ -3,10 +3,10 @@ fdmove -c 2 1 -backtick host { pipeline pwd | sed -r "s,.*/tls-,," } -importas host host +s6-envdir ./env/ +importas HOST HOST -mkdir -p /tmp/tls +mkdir -p /tmp/tls/ -unixserver /tmp/tls/$host -brssl client $host +unixserver /tmp/tls/$HOST +brssl client $HOST