moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

sqmail: service tweaks.

Browse source 
Add service tags to all loggers.
Listen on :0 instead of :: to force dual-stack.
Make run scripts conf_files, as they are meant to be adapted to your needs.
This commit is contained in:
Leah Neukirchen 2020-03-14 21:40:00 +01:00
parent 9a1744a7e6
commit 198edb5c7e
8 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/sqmail/files/qmail-send/log/run
View file

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
exec vlogger -p mail.notice exec vlogger -p mail.notice -t qmail-send

2
srcpkgs/sqmail/files/qmail-smtpd/log/run
View file

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
exec vlogger -p mail.notice exec vlogger -p mail.notice -t qmail-smtpd

4
srcpkgs/sqmail/files/qmail-smtpd/run
View file

@ -9,13 +9,13 @@ if [ -f /var/qmail/ssl/ssl.env ]; then
exec env PATH="/var/qmail/bin:$PATH" \ exec env PATH="/var/qmail/bin:$PATH" \
sslserver -seVn -Rp -l $HOSTNAME \ sslserver -seVn -Rp -l $HOSTNAME \
-Xx /var/qmail/control/rules.smtpd.cdb \ -Xx /var/qmail/control/rules.smtpd.cdb \
-u $QMAILU -g $QMAILG :: 25 \ -u $QMAILU -g $QMAILG :0 25 \
qmail-smtpd 2>&1 qmail-smtpd 2>&1
else else
exec env PATH="/var/qmail/bin:$PATH" \ exec env PATH="/var/qmail/bin:$PATH" \
tcpserver -p -v \ tcpserver -p -v \
-Xx /var/qmail/control/rules.smtpd.cdb \ -Xx /var/qmail/control/rules.smtpd.cdb \
-u $QMAILU -g $QMAILG :: 25 \ -u $QMAILU -g $QMAILG :0 25 \
qmail-smtpd 2>&1 qmail-smtpd 2>&1
fi fi

2
srcpkgs/sqmail/files/qmail-smtpsd/log/run
View file

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
exec vlogger -p mail.notice exec vlogger -p mail.notice -t qmail-smtpsd

2
srcpkgs/sqmail/files/qmail-smtpsd/run
View file

@ -7,6 +7,6 @@ export SMTPAUTH="!"
exec env PATH="/var/qmail/bin:/usr/local/bin:$PATH" \ exec env PATH="/var/qmail/bin:/usr/local/bin:$PATH" \
sslserver -seV -Rp -l $HOSTNAME \ sslserver -seV -Rp -l $HOSTNAME \
-Xx /var/qmail/control/rules.smtpd.cdb \ -Xx /var/qmail/control/rules.smtpd.cdb \
-u $QMAILU -g $QMAILG :: 465 \ -u $QMAILU -g $QMAILG :0 465 \
qmail-smtpd qmail-authuser true 2>&1 qmail-smtpd qmail-authuser true 2>&1

2
srcpkgs/sqmail/files/qmail-smtpsub/log/run
View file

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
exec vlogger -p mail.notice exec vlogger -p mail.notice -t qmail-smtpsub

2
srcpkgs/sqmail/files/qmail-smtpsub/run
View file

@ -7,5 +7,5 @@ export UCSPITLS="!"
. /var/qmail/ssl/ssl.env . /var/qmail/ssl/ssl.env
exec env PATH="/var/qmail/bin:/usr/local/bin:$PATH" \ exec env PATH="/var/qmail/bin:/usr/local/bin:$PATH" \
sslserver -seVn -Rp -l $HOSTNAME \ sslserver -seVn -Rp -l $HOSTNAME \
-u $QMAILU -g $QMAILG :: 587 \ -u $QMAILU -g $QMAILG :0 587 \
qmail-smtpd qmail-authuser true 2>&1 qmail-smtpd qmail-authuser true 2>&1

3
srcpkgs/sqmail/template
View file

@ -1,7 +1,7 @@
# Template file for 'sqmail' # Template file for 'sqmail'
pkgname=sqmail pkgname=sqmail
version=4.0.03 version=4.0.03
revision=1 revision=2
create_wrksrc=yes create_wrksrc=yes
build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src" build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
makedepends="fehQlibs libidn2-devel ucspi-ssl-devel" makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"
@ -15,6 +15,7 @@ checksum=fec96b51aee3506b6c068b0040304eb530f6926f719d9b917f07fac53f5e12bc
nocross="custom build system" nocross="custom build system"
provides="smtp-server-0_1" provides="smtp-server-0_1"
replaces="smtp-server>=0" replaces="smtp-server>=0"
conf_files="/etc/sv/*/run /etc/sv/*/log/run"
system_groups="_nofiles:798 _sqmail:799" system_groups="_nofiles:798 _sqmail:799"