From b36b8501b640623625fdbff6e1b1934036211903 Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Thu, 10 May 2018 11:42:12 +0800 Subject: [PATCH 1/5] include some undocumented containers --- docs/debug-attach_service.md | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/debug-attach_service.md b/docs/debug-attach_service.md index fb9946d2a..6c06819d4 100644 --- a/docs/debug-attach_service.md +++ b/docs/debug-attach_service.md @@ -27,14 +27,19 @@ docker-compose exec redis-mailcow redis-cli Here is a brief overview of what container / service does what: -| Service Name | Service Descriptions | -| --------------- | ------------------------------------------------------------------------- | -| unbound-mailcow | Local (DNSSEC) DNS Resolver | -| mysql-mailcow | Stores SOGo's and most of mailcow's settings | -| postfix-mailcow | Receives and sends mails | -| dovecot-mailcow | User logins and sieve filter | -| redis-mailcow | Storage back-end for DKIM keys and Rspamd | -| rspamd-mailcow | Mail filtering system. Used for av handling, dkim signing, spam handling | -| clamd-mailcow | Scans attachments for viruses | -| sogo-mailcow | Webmail client that handles Microsoft ActiveSync and Cal- / CardDav | -| nginx-mailcow | Nginx remote proxy that handles all mailcow related HTTP / HTTPS requests | +| Service Name | Service Descriptions | +| ----------------- | ------------------------------------------------------------------------- | +| unbound-mailcow | Local (DNSSEC) DNS Resolver | +| mysql-mailcow | Stores SOGo's and most of mailcow's settings | +| postfix-mailcow | Receives and sends mails | +| dovecot-mailcow | User logins and sieve filter | +| redis-mailcow | Storage back-end for DKIM keys and Rspamd | +| rspamd-mailcow | Mail filtering system. Used for av handling, dkim signing, spam handling | +| clamd-mailcow | Scans attachments for viruses | +| sogo-mailcow | Webmail client that handles Microsoft ActiveSync and Cal- / CardDav | +| nginx-mailcow | Nginx remote proxy that handles all mailcow related HTTP / HTTPS requests | +| acme-mailcow | +| memcached-mailcow | +| watchdog-mailcow | +| php-fpm-mailcow | +| netfilter-mailcow | From 9e9be1879e19f22631bae9990935fbc349479ccf Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Thu, 10 May 2018 12:05:03 +0800 Subject: [PATCH 2/5] added some service descriptions you are always welcome to revise the following description to whatever you think that's appropriate --- docs/debug-attach_service.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/debug-attach_service.md b/docs/debug-attach_service.md index 6c06819d4..e20719995 100644 --- a/docs/debug-attach_service.md +++ b/docs/debug-attach_service.md @@ -38,8 +38,8 @@ Here is a brief overview of what container / service does what: | clamd-mailcow | Scans attachments for viruses | | sogo-mailcow | Webmail client that handles Microsoft ActiveSync and Cal- / CardDav | | nginx-mailcow | Nginx remote proxy that handles all mailcow related HTTP / HTTPS requests | -| acme-mailcow | -| memcached-mailcow | -| watchdog-mailcow | -| php-fpm-mailcow | -| netfilter-mailcow | +| acme-mailcow | Automates HTTPS (SSL/TLS) certificate deployment | +| memcached-mailcow | Internal caching system for mailcow services | +| watchdog-mailcow | Allows the monitoring of docker containers / services | +| php-fpm-mailcow | Powers the mailcow web UI | +| netfilter-mailcow | Fail2Ban like integration | From 6e7726346d06fb0bbfdce83c8a6c90316a997d39 Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Thu, 10 May 2018 12:10:53 +0800 Subject: [PATCH 3/5] fail2ban to netfilter --- docs/firststeps-logging.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/firststeps-logging.md b/docs/firststeps-logging.md index 80c64060f..7df477bd2 100644 --- a/docs/firststeps-logging.md +++ b/docs/firststeps-logging.md @@ -14,12 +14,12 @@ The **default logging driver is "json"**. Some logs are filtered and written to Redis keys but also streamed to a Redis channel. -The Redis channel is used to stream logs with failed authentication attempts to be read by fail2ban-mailcow. +The Redis channel is used to stream logs with failed authentication attempts to be read by netfilter-mailcow. The Redis keys are persistent and will keep 10000 lines of logs for the web UI. This mechanism makes it possible to use whatever Docker logging driver you want to, without losing -the ability to read logs from the UI or ban suspicious clients with fail2ban-mailcow. +the ability to read logs from the UI or ban suspicious clients with netfilter-mailcow. Redis keys will only hold logs from applications and filter out system messages (think of cron etc.). From e38cc122e8fbc2fcf2f4c59445b4c01a3e502d6c Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Thu, 10 May 2018 12:13:04 +0800 Subject: [PATCH 4/5] fail2ban to netfilter --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 878bfe80b..5d28e6903 100644 --- a/docs/index.md +++ b/docs/index.md @@ -57,7 +57,7 @@ Each container represents a single application. - Nginx - Rspamd - SOGo -- Fail2ban-like integration by @mkuron +- Netfilter (Fail2ban-like integration by @mkuron) **6 volumes** to keep dynamic data - take care of them! From 01a9c9ca5ac9390e42caa254c67302b4991f7b09 Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Thu, 10 May 2018 12:15:43 +0800 Subject: [PATCH 5/5] correction --- docs/debug-logs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/debug-logs.md b/docs/debug-logs.md index 7b5eb694d..dfab5d800 100644 --- a/docs/debug-logs.md +++ b/docs/debug-logs.md @@ -1,5 +1,5 @@ !!! warning - This section only applies for Dockers default logging driver (Json). + This section only applies for Dockers default logging driver (JSON). To view the logs of all mailcow: dockerized related containers, you can use `docker-compose logs` inside your mailcow-dockerized folder that contains your `mailcow.conf`. This is usually a bit much, but you could trim the output with `--tail=100` to the last 100 lines per container, or add a `-f` to follow the live output of all your services.