From ba5847747eea2795f6a26423e915c0326c37b203 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Fri, 23 Jun 2017 18:57:50 +0200
Subject: [PATCH] Remove f2b, update index

---
 docs/firststeps-syslog.md | 46 ++++++++++++---------------------------
 docs/index.md             |  8 +++++--
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/docs/firststeps-syslog.md b/docs/firststeps-syslog.md
index 06687506e..5eaf390e8 100644
--- a/docs/firststeps-syslog.md
+++ b/docs/firststeps-syslog.md
@@ -1,3 +1,6 @@
+!!! warning
+    You will lose the integrated fail2ban functionality when using a logging driver other than json (default).
+
 Enable Rsyslog to receive logs on 524/tcp at `rsyslog.conf`:
 
 ```
@@ -34,7 +37,17 @@ Linux users can add or change the configuration in `/etc/docker/daemon.json`. Wi
 
 ```
 
-!!! info
+!!! warning
+    In newer versions of mailcow: dockerized we decided to set a max. log size. You need to remove all "logging: xy" lines and options from docker-compose.yml to be able to start the stack.
+    
+    Example:
+    ````
+    logging:
+      options:
+        max-size: "5m"
+    ```
+
+    !!! info
     If you prefere the udp protocol use:
     
     ```
@@ -45,34 +58,3 @@ Linux users can add or change the configuration in `/etc/docker/daemon.json`. Wi
     at `rsyslog.conf` and `"syslog-address": "udp://127.0.0.1:524"` at `daemon.json`.
     
 Restart the Docker daemon and run `docker-compose down && docker-compose up -d` to recreate the containers.
-
-
-### Fail2ban
-
-**This is a subsection of "Log to Syslog", which is required for Fail2ban to work.**
-
-Open `/etc/fail2ban/filter.d/common.conf` and search for the prefix_line parameter, change it to ".*":
-
-```
-__prefix_line = .*
-```
-
-Create `/etc/fail2ban/jail.d/dovecot.conf`...
-```
-[dovecot]
-enabled = true
-filter  = dovecot
-logpath = /var/log/syslog
-chain = FORWARD
-```
-
-and `jail.d/postfix-sasl.conf`:
-```
-[postfix-sasl]
-enabled = true
-filter  = postfix-sasl
-logpath = /var/log/syslog
-chain = FORWARD
-```
-
-Restart Fail2ban.
diff --git a/docs/index.md b/docs/index.md
index 0fbedd019..a11d0df1b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -28,6 +28,7 @@ You can find screenshots [on Imgur](http://imgur.com/a/oewYt).
 The integrated **mailcow UI** allows administrative work on your mail server instance as well as separated domain administrator and mailbox user access:
 
 - DKIM key management
+- ARC support
 - Black- and whitelists per domain and per user
 - Spam score management per-user (reject spam, mark spam, greylist)
 - Allow mailbox users to create temporary spam aliases
@@ -38,8 +39,9 @@ The integrated **mailcow UI** allows administrative work on your mail server ins
 - TFA: Yubi OTP and U2F USB (Google Chrome and derivatives only), TOTP
 - Add domains, mailboxes, aliases, domain aliases and SOGo resources
 - Add whitelisted hosts to forward mail to mailcow
+- Fail2ban-like integration
 
-mailcow dockerized comes with **12 containers** linked in **one bridged network**.
+mailcow dockerized comes with multiple containers linked in one bridged network.
 Each container represents a single application.
 
 - Dovecot
@@ -47,13 +49,15 @@ Each container represents a single application.
 - Memcached
 - Redis
 - MySQL
-- Bind9 (Resolver) (formerly PDNS Recursor)
+- Unbound (as resolver)
 - PHP-FPM
 - Postfix
+- ACME-Client (thanks to @bebehei)
 - Nginx
 - Rmilter
 - Rspamd
 - SOGo
+- Fail2ban-like integration by @mkuron
 
 **6 volumes** to keep dynamic data - take care of them!