Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-17 14:37:02 +00:00
Code Releases Activity

etc: Simplify default config by removing systemd sockets

Browse Source 
Having systemd open sockets and pass them to chasquid is neat, but also
adds some complexity to the default config, for very little value in
practice.

This patch simplifies the default config by having chasquid open the
sockets instead.

Note that systemd file descriptor passing continues to be supported, and
existing installations will not be affected.
This commit is contained in:
Alberto Bertogli
2022-11-12 11:37:56 +00:00
parent 48da3c1657
commit 2bad7a14be
5 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
etc/chasquid/chasquid.conf
View File

@@ -14,19 +14,19 @@
# Default: "systemd", which means systemd passes sockets to us. # Default: "systemd", which means systemd passes sockets to us.
# systemd sockets must be named with "FileDescriptorName=smtp". # systemd sockets must be named with "FileDescriptorName=smtp".
#smtp_address: "systemd" #smtp_address: "systemd"
#smtp_address: ":25" smtp_address: ":25"
# Addresses to listen on for submission (usually port 587). # Addresses to listen on for submission (usually port 587).
# Default: "systemd", which means systemd passes sockets to us. # Default: "systemd", which means systemd passes sockets to us.
# systemd sockets must be named with "FileDescriptorName=submission". # systemd sockets must be named with "FileDescriptorName=submission".
#submission_address: "systemd" #submission_address: "systemd"
#submission_address: ":587" submission_address: ":587"
# Addresses to listen on for submission-over-TLS (usually port 465). # Addresses to listen on for submission-over-TLS (usually port 465).
# Default: "systemd", which means systemd passes sockets to us. # Default: "systemd", which means systemd passes sockets to us.
# systemd sockets must be named with "FileDescriptorName=submission_tls". # systemd sockets must be named with "FileDescriptorName=submission_tls".
#submission_over_tls_address: "systemd" #submission_over_tls_address: "systemd"
#submission_over_tls_address: ":465" submission_over_tls_address: ":465"
# Address for the monitoring http server. # Address for the monitoring http server.
# Do NOT expose this to the public internet. # Do NOT expose this to the public internet.

11
etc/systemd/system/chasquid-smtp.socket
View File

@@ -1,11 +0,0 @@
[Unit]
Description=chasquid mail daemon (SMTP sockets)
[Socket]
ListenStream=25
FileDescriptorName=smtp
Service=chasquid.service
[Install]
WantedBy=chasquid.target

11
etc/systemd/system/chasquid-submission.socket
View File

@@ -1,11 +0,0 @@
[Unit]
Description=chasquid mail daemon (submission sockets)
[Socket]
ListenStream=587
FileDescriptorName=submission
Service=chasquid.service
[Install]
WantedBy=chasquid.target

11
etc/systemd/system/chasquid-submission_tls.socket
View File

@@ -1,11 +0,0 @@
[Unit]
Description=chasquid mail daemon (submission over TLS sockets)
[Socket]
ListenStream=465
FileDescriptorName=submission_tls
Service=chasquid.service
[Install]
WantedBy=chasquid.target

6
etc/systemd/system/chasquid.service
View File

@@ -1,8 +1,5 @@
[Unit] [Unit]
Description=chasquid mail daemon (service) Description=chasquid mail daemon (service)
Requires=chasquid-smtp.socket \
chasquid-submission.socket \
chasquid-submission_tls.socket
[Service] [Service]
ExecStart=/usr/local/bin/chasquid \ ExecStart=/usr/local/bin/chasquid \
@@ -17,6 +14,9 @@ Restart=always
User=mail User=mail
Group=mail Group=mail
# Let chasquid listen on ports < 1024.
AmbientCapabilities=CAP_NET_BIND_SERVICE
# Simple security measures just in case. # Simple security measures just in case.
ProtectSystem=full ProtectSystem=full