summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--content/mail/security.md11
-rw-r--r--content/tor.md6
2 files changed, 10 insertions, 7 deletions
diff --git a/content/mail/security.md b/content/mail/security.md
index 76dac80..67ad079 100644
--- a/content/mail/security.md
+++ b/content/mail/security.md
@@ -42,18 +42,20 @@ Go down to the `# Mail servers` line and paste this:
enabled = true
port = smtp,ssmtp,submission
filter = postfix
- logpath = /var/log/mail.log
+ logpath = %(postfix_log)s
+ backend = systemd
[sasl]
enabled = true
port = smtp,ssmtp,submission,imap2,imap3,imaps,pop3,pop3s
- filter = postfix-sasl
+ filter = postfix[mode=auth]
# You might consider monitoring /var/log/mail.warn instead if you are
# running postfix since it would provide the same log lines at the
# "warn" level but overall at the smaller filesize.
- logpath = /var/log/mail.warn
+ logpath = %(postfix_log)s
+ backend = systemd
maxretry = 1
bantime = 21600
@@ -62,7 +64,8 @@ Go down to the `# Mail servers` line and paste this:
enabled = true
port = smtp,ssmtp,submission,imap2,imap3,imaps,pop3,pop3s
filter = dovecot
- logpath = /var/log/mail.log
+ logpath = %(dovecot_log)s
+ backend = systemd
This will only grant 2 login attempts and then block the requester for 6 hours. Now restart `fail2ban`:
diff --git a/content/tor.md b/content/tor.md
index b1c827d..95e630c 100644
--- a/content/tor.md
+++ b/content/tor.md
@@ -23,12 +23,12 @@ system](https://support.torproject.org/apt/tor-deb-repo/) to get the
latest version of Tor:
apt install -y apt-transport-https gpg
- echo "deb [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main
- deb-src [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main" > /etc/apt/sources.list.d/tor.list
+ echo "deb [signed-by=/usr/share/keyrings/deb.torproject.org-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main
+ deb-src [signed-by=/usr/share/keyrings/deb.torproject.org-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main" > /etc/apt/sources.list.d/tor.list
Then we need to add the GPG keys to our keyring:
- curl -s https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor > /usr/share/keyrings/tor-archive-keyring.gpg
+ curl -s https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor > /usr/share/keyrings/deb.torproject.org-keyring.gpg
Now install Tor: