From a31819fd6c73efc2684eb6c6f725803d39640c72 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Tue, 11 Jul 2017 17:08:06 +0200
Subject: [PATCH] [SOGo] Log to a pipe to not keep logs in a container

---
 data/Dockerfiles/sogo/supervisord.conf | 20 ++++++++++++--------
 data/Dockerfiles/sogo/syslog-ng.conf   | 18 ++++++++----------
 data/conf/sogo/sogo.conf               |  1 +
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/data/Dockerfiles/sogo/supervisord.conf b/data/Dockerfiles/sogo/supervisord.conf
index b76173fe..30392e3b 100644
--- a/data/Dockerfiles/sogo/supervisord.conf
+++ b/data/Dockerfiles/sogo/supervisord.conf
@@ -3,9 +3,11 @@ nodaemon=true
 
 [program:syslog-ng]
 command=/usr/sbin/syslog-ng --foreground  --no-caps
-redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 autostart=true
-stdout_syslog=true
 priority=1
 
 [program:cron]
@@ -22,22 +24,24 @@ priority=4
 
 [program:reconf-domains]
 command=/reconf-domains.sh
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 priority=3
 autorestart=true
 
 [program:sogo]
 command="/usr/sbin/sogod"
 user=sogo
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
 autorestart = unexpected
 autostart = false
 priority=5
 
-[program:sogo-syslog]
-command=/usr/bin/tail -f /var/log/combined.log
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-priority=6
-
 [inet_http_server]
 port=9191
 
diff --git a/data/Dockerfiles/sogo/syslog-ng.conf b/data/Dockerfiles/sogo/syslog-ng.conf
index 4d17d9b1..264bca44 100644
--- a/data/Dockerfiles/sogo/syslog-ng.conf
+++ b/data/Dockerfiles/sogo/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.5
+@version: 3.8
 @include "scl.conf"
 options {
   chain_hostnames(off);
@@ -14,12 +14,10 @@ source s_src {
   internal();
 };
 source s_sogo {
-  file("/var/log/sogo/sogo.log");
+  pipe("/dev/sogo_log" owner(sogo) group(sogo));
 };
-destination d_combined {
-  file("/var/log/combined.log");
-};
-destination d_redis_persistent_log {
+destination d_stdout { pipe("/dev/stdout"); };
+destination d_redis_ui_log {
   redis(
     host("redis-mailcow")
     persist-name("redis1")
@@ -37,11 +35,11 @@ destination d_redis_f2b_channel {
 };
 log {
   source(s_sogo);
-  source(s_src);
-  destination(d_combined);
+  destination(d_redis_ui_log);
+  destination(d_redis_f2b_channel);
 };
 log {
   source(s_sogo);
-  destination(d_redis_persistent_log);
-  destination(d_redis_f2b_channel);
+  source(s_src);
+  destination(d_stdout);
 };
diff --git a/data/conf/sogo/sogo.conf b/data/conf/sogo/sogo.conf
index 32dc1e5e..151f5aa3 100644
--- a/data/conf/sogo/sogo.conf
+++ b/data/conf/sogo/sogo.conf
@@ -78,4 +78,5 @@
   //MySQL4DebugEnabled = YES;
   //SOGoUIxDebugEnabled = YES;
   //WODontZipResponse = YES;
+    WOLogFile = "/dev/sogo_log";
 }