From ca69f91f6b14ee46ce61aaac651680d07d46b231 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 May 2025 21:21:58 +0200 Subject: [PATCH 1/4] update.sh: drop The section it updates was removed in d460e9ff62ea1238fb3348a87326b743ae177902. --- update.sh | 7 ------- 1 file changed, 7 deletions(-) delete mode 100755 update.sh diff --git a/update.sh b/update.sh deleted file mode 100755 index 39d6402..0000000 --- a/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -sed -i -e "s/v[0-9]\+\.[0-9]\+\.[0-9]\+/$1/g" README.md - -HASH=$(nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.3.0/nixos-mailserver-$1.tar.gz" --unpack) - -sed -i -e "s/sha256 = \"[0-9a-z]\{52\}\"/sha256 = \"$HASH\"/g" README.md From a071813b974b6ba7c46ad0ce428022937e7c4b99 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 May 2025 21:51:59 +0200 Subject: [PATCH 2/4] README: reword feature list and remove the v2.0 release title. --- README.md | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 337163b..ac38e5a 100644 --- a/README.md +++ b/README.md @@ -26,37 +26,36 @@ can stay up to date with bug fixes and updates. ## Features -### v2.0 + * [x] Continous Integration Testing * [x] Multiple Domains - * Postfix MTA - - [x] smtp on port 25 - - [x] submission tls on port 465 - - [x] submission starttls on port 587 - - [x] lmtp with dovecot + * Postfix + - [x] SMTP on port 25 + - [x] Submission TLS on port 465 + - [x] Submission StartTLS on port 587 + - [x] LMTP with Dovecot * Dovecot - - [x] maildir folders - - [x] imap with tls on port 993 - - [x] pop3 with tls on port 995 - - [x] imap with starttls on port 143 - - [x] pop3 with starttls on port 110 + - [x] Maildir folders + - [x] IMAP with TLS on port 993 + - [x] POP3 with TLS on port 995 + - [x] IMAP with StartTLS on port 143 + - [x] POP3 with StartTLS on port 110 * Certificates - - [x] manual certificates - - [x] on the fly creation - - [x] Let's Encrypt + - [x] ACME + - [x] Custom certificates * Spam Filtering - - [x] via rspamd + - [x] Via Rspamd * Virus Scanning - - [x] via clamav + - [x] Via ClamAV * DKIM Signing - - [x] via opendkim + - [x] Via OpenDKIM * User Management - - [x] declarative user management - - [x] declarative password management + - [x] Declarative user management + - [x] Declarative password management - [x] LDAP users - * Sieves - - [x] A simple standard script that moves spam + * Sieve - [x] Allow user defined sieve scripts + - [x] Moving mails from/to junk trains the Bayes filter - [x] ManageSieve support * User Aliases - [x] Regular aliases From 84bf0c0c079963d04230c179bbf4985d1cbdab23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 May 2025 21:52:42 +0200 Subject: [PATCH 3/4] README.md: remove mailing list information Has been unused since 2019, so it is not a good recommendation to subscribe there anymore. --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index ac38e5a..3a1ccde 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,6 @@ SNM branch corresponding to your NixOS version. - Use the [SNM branch `master`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/master) - [Documentation](https://nixos-mailserver.readthedocs.io/en/latest/) -[Subscribe to SNM Announcement List](https://www.freelists.org/list/snm) -This is a very low volume list where new releases of SNM are announced, so you -can stay up to date with bug fixes and updates. - - ## Features * [x] Continous Integration Testing @@ -76,7 +71,6 @@ can stay up to date with bug fixes and updates. ### Get in touch -- Subscribe to the [mailing list](https://www.freelists.org/archive/snm/) - Join the Libera Chat IRC channel `#nixos-mailserver` ## How to Set Up a 10/10 Mail Server Guide From 8800bccab84dc963a7dbc4267a915169230d3434 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 May 2025 22:30:39 +0200 Subject: [PATCH 4/4] dovecot: fix config indent --- mail-server/dovecot.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix index 31855db..ff2b3e6 100644 --- a/mail-server/dovecot.nix +++ b/mail-server/dovecot.nix @@ -287,8 +287,8 @@ in } service imap { - vsz_limit = ${builtins.toString cfg.imapMemoryLimit} MB - } + vsz_limit = ${builtins.toString cfg.imapMemoryLimit} MB + } protocol pop3 { mail_max_userip_connections = ${toString cfg.maxConnectionsPerUser} @@ -305,12 +305,12 @@ in mode = 0600 user = ${postfixCfg.user} } - vsz_limit = ${builtins.toString cfg.lmtpMemoryLimit} MB + vsz_limit = ${builtins.toString cfg.lmtpMemoryLimit} MB } service quota-status { - vsz_limit = ${builtins.toString cfg.quotaStatusMemoryLimit} MB - } + vsz_limit = ${builtins.toString cfg.quotaStatusMemoryLimit} MB + } recipient_delimiter = ${cfg.recipientDelimiter} lmtp_save_to_detail_mailbox = ${cfg.lmtpSaveToDetailMailbox}