dot

packages and services management
Log | Files | Refs | README

commit ad96512b73eb26158b5e695b72a13cc05d1f52ab
parent 7fc6f400589a0ec02f8dda63e98ee27053141c99
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sun, 21 Oct 2018 14:52:00 +0200

on my way toward sending mails

Diffstat:
Aconf-dhparams | 4++++
Mdot/mblaze/profile | 3++-
Ms6/ngircd-tls/data/conf | 13+++++++------
Ds6/ngircd-tls/data/tls | 8--------
Ms6/ngircd-tls/run | 2+-
Ms6/qmail-log/consumer-for | 6+++---
Ms6/qmail-log/run | 2+-
Ms6/qmail-send/run | 6+++---
8 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/conf-dhparams b/conf-dhparams @@ -0,0 +1,4 @@ +#!/bin/sh -e + +openssl dhparam -out /etc/ssl/dhparam.pem 4096 +chmod 444 /etc/ssl/dhparam.pem diff --git a/dot/mblaze/profile b/dot/mblaze/profile @@ -1,3 +1,4 @@ -Sendmail: msmtp +Sendmail: qmail-inject +Sendmail-Args: -A Local-Mailbox: mail@josuah.net Outbox: /home/josuah/mail/OUTBOX diff --git a/s6/ngircd-tls/data/conf b/s6/ngircd-tls/data/conf @@ -1,5 +1,5 @@ [Global] - Name = XXX + Name = josuah.net AdminInfo1 = josuah AdminInfo2 = XXX AdminEMail = mail@josuah.net @@ -30,9 +30,9 @@ [SSL] Ports = 6697 - CertFile = data/pem - DHFile = data/dhp - KeyFile = data/key + CertFile = /etc/ssl/josuah.net/cert.pem + DHFile = /etc/ssl/dhparam.pem + KeyFile = /etc/ssl/josuah.net/privkey.pem KeyFilePassword = XXX CipherList = AES+RSA @@ -40,5 +40,6 @@ Name = josuah Password = XXX Mask = josuah!XXX - [Server] - XXX + +[Server] + #XXX diff --git a/s6/ngircd-tls/data/tls b/s6/ngircd-tls/data/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/ngircd-tls/run b/s6/ngircd-tls/run @@ -2,4 +2,4 @@ # Internet Relay Chat (IRC) daemon with TLS support (see ./tls) fdmove -c 2 1 -ngircd -n -f ./data/conf +ngircd -n -f data/conf diff --git a/s6/qmail-log/consumer-for b/s6/qmail-log/consumer-for @@ -1,5 +1,5 @@ qmail-pop3d qmail-send -qmail-tcp -qmail-tls-25 -qmail-tls-587 +qmail-tcp-25 +qmail-tcp-587 +qmail-tls diff --git a/s6/qmail-log/run b/s6/qmail-log/run @@ -1,4 +1,4 @@ #!/usr/bin/env execlineb fdmove -c 2 1 -s6-log t /var/log/qmail-send +s6-log t /var/log/qmail diff --git a/s6/qmail-send/run b/s6/qmail-send/run @@ -1,7 +1,7 @@ #!/usr/bin/env execlineb -# start watching qmail dir for queued messages fdmove -c 2 1 -s6-envdir ./env/ -importas MAILDIR MAILDIR +s6-envdir env multisubstitute { + importas MAILDIR MAILDIR +} qmail-start $MAILDIR