Merge branch 'cleanup' into 'master'

Various cleanups

See merge request simple-nixos-mailserver/nixos-mailserver!387

README.md

@@ -20,43 +20,37 @@ 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
-### 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
@@ -77,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

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}

update.sh

@@ -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