From acbb586e71cc148a634961c31709bf36e52b5d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Tue, 16 Oct 2018 12:38:17 +0300
Subject: [PATCH 1/2] Option to send logs to journald or syslog

---
 docs/compose/.env               | 6 ++++++
 docs/compose/docker-compose.yml | 2 ++
 tests/compose/core.env          | 6 ++++++
 tests/compose/run.yml           | 2 ++
 4 files changed, 16 insertions(+)

diff --git a/docs/compose/.env b/docs/compose/.env
index 721aaf22..86896c43 100644
--- a/docs/compose/.env
+++ b/docs/compose/.env
@@ -120,6 +120,12 @@ WEBSITE=https://mailu.io
 # Advanced settings
 ###################################
 
+# Log driver for front service. Possible values:
+# json-file (default)
+# journald (On systemd platforms, useful for Fail2Ban integration)
+# syslog (Non systemd platforms, Fail2Ban integration. Disables `docker-compose log` for front!)
+LOG_DRIVER=json-file
+
 # Docker-compose project name, this will prepended to containers names.
 COMPOSE_PROJECT_NAME=mailu
 
diff --git a/docs/compose/docker-compose.yml b/docs/compose/docker-compose.yml
index 6f2da078..b8d15587 100644
--- a/docs/compose/docker-compose.yml
+++ b/docs/compose/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     image: mailu/nginx:$VERSION
     restart: always
     env_file: .env
+    logging:
+      driver: $LOG_DRIVER
     ports:
     - "$BIND_ADDRESS4:80:80"
     - "$BIND_ADDRESS4:443:443"
diff --git a/tests/compose/core.env b/tests/compose/core.env
index 89120d4f..78c307c0 100644
--- a/tests/compose/core.env
+++ b/tests/compose/core.env
@@ -120,6 +120,12 @@ WEBSITE=https://mailu.io
 # Advanced settings
 ###################################
 
+# Log driver for front service. Possible values:
+# json-file (default)
+# journald (On systemd platforms, useful for Fail2Ban integration)
+# syslog (Non systemd platforms, Fail2Ban integration. Disables `docker-compose log` for front!)
+LOG_DRIVER=json-file
+
 # Docker-compose project name, this will prepended to containers names.
 #COMPOSE_PROJECT_NAME=mailu
 
diff --git a/tests/compose/run.yml b/tests/compose/run.yml
index 56ea1627..39ad3dc2 100644
--- a/tests/compose/run.yml
+++ b/tests/compose/run.yml
@@ -6,6 +6,8 @@ services:
     image: $DOCKER_ORG/nginx:$VERSION
     restart: 'no'
     env_file: $PWD/.env
+    logging:
+      driver: journald
     ports:
     - "$BIND_ADDRESS4:80:80"
     - "$BIND_ADDRESS4:443:443"

From f3ebf35c75ed2038e01eef4c40863a6a10d29e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Tue, 16 Oct 2018 12:56:12 +0300
Subject: [PATCH 2/2] Fix autotest

---
 tests/compose/run.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/compose/run.yml b/tests/compose/run.yml
index 39ad3dc2..eac35b76 100644
--- a/tests/compose/run.yml
+++ b/tests/compose/run.yml
@@ -7,7 +7,7 @@ services:
     restart: 'no'
     env_file: $PWD/.env
     logging:
-      driver: journald
+      driver: $LOG_DRIVER
     ports:
     - "$BIND_ADDRESS4:80:80"
     - "$BIND_ADDRESS4:443:443"