dot

packages and services management
Log | Files | Refs | README

commit 1ee19832684c957c6d15363a4656415ee7c1427f
parent 4981101d8ac983e0621230ba7061a8620e416a7b
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sun, 21 Oct 2018 05:33:36 +0200

qmail: add tls for reception

Diffstat:
Mbin/ll | 2+-
Ms6-load | 2+-
Ms6/httpfile-tls/run | 4+++-
Ms6/qmail-log/consumer-for | 1+
Ms6/qmail-tcp/run | 11+----------
Ds6/qmail-tcp/tls | 8--------
As6/qmail-tls/env/CERTFILE | 1+
As6/qmail-tls/env/KEYFILE | 1+
As6/qmail-tls/producer-for | 1+
As6/qmail-tls/run | 10++++++++++
As6/qmail-tls/type | 1+
11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/bin/ll b/bin/ll @@ -1,2 +1,2 @@ #!/bin/sh -e -exec lr -l1GG "$@" | exec less -RSF +exec lr -l1GG "$@" diff --git a/s6-load b/s6-load @@ -1,6 +1,6 @@ #!/usr/bin/env execlineb -backtick t { s6-clock } importas t t +backtick t { s6-clock } importas -n t t if { s6-rc-compile "/var/s6/compiled$t" /etc/s6 } if { s6-rc-update -l /var/s6/live "/var/s6/compiled$t" } if { s6-ln -nsf "/var/s6/compiled$t" /var/s6/compiled } diff --git a/s6/httpfile-tls/run b/s6/httpfile-tls/run @@ -1,7 +1,9 @@ #!/usr/bin/env execlineb fdmove -c 2 1 +s6-envdir env multisubstitute { + importas -n ACCESSFILE ACCESSFILE +} -s6-envdir env importas -n ACCESSFILE ACCESSFILE s6-envuidgid www unexport ACCESSFILE diff --git a/s6/qmail-log/consumer-for b/s6/qmail-log/consumer-for @@ -1,3 +1,4 @@ qmail-pop3d qmail-send qmail-tcp +qmail-tls diff --git a/s6/qmail-tcp/run b/s6/qmail-tcp/run @@ -2,16 +2,7 @@ # qmail smtp daemon fdmove -c 2 1 -foreground { if { test ! -d data/key } - if { mkdir -p data/key } - cd data/key - if { openssl req -nodes -new -x509 -keyout key -out pem } - if { openssl dhparam -out dhp 4096 } - if { chmod -R 500 data/key } - if { chmod 400 data/key/key data/key/pem data/key/dhp } -} - -s6-envdir ./env/ +s6-envdir env s6-envuidgid qmaild diff --git a/s6/qmail-tcp/tls b/s6/qmail-tcp/tls @@ -1,8 +0,0 @@ -#!/bin/sh -e - -openssl req -x509 -newkey rsa:4096 -days 365 -keyout key -out pem -chmod 400 key -chmod 444 pem - -openssl dhparam -out dhp 4096 -chmod 444 dhp diff --git a/s6/qmail-tls/env/CERTFILE b/s6/qmail-tls/env/CERTFILE @@ -0,0 +1 @@ +/etc/ssl/josuah.net/cert.pem diff --git a/s6/qmail-tls/env/KEYFILE b/s6/qmail-tls/env/KEYFILE @@ -0,0 +1 @@ +/etc/ssl/josuah.net/privkey.pem diff --git a/s6/qmail-tls/producer-for b/s6/qmail-tls/producer-for @@ -0,0 +1 @@ +qmail-log diff --git a/s6/qmail-tls/run b/s6/qmail-tls/run @@ -0,0 +1,10 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas -n ACCESSFILE ACCESSFILE +} + +s6-envuidgid qmaild + +s6-tlsserver -U 0.0.0.0 465 +qmail-smtpd diff --git a/s6/qmail-tls/type b/s6/qmail-tls/type @@ -0,0 +1 @@ +longrun