public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
[Postfix] Do not keep persistent logs in a container
f8ae5158
data/Dockerfiles/postfix/Dockerfile | 5 ++---
data/Dockerfiles/postfix/supervisord.conf | 11 ++++-------
data/Dockerfiles/postfix/syslog-ng.conf | 9 ++++-----
data/Dockerfiles/postfix/zeyple.conf | 2 +-
4 files changed, 11 insertions(+), 16 deletions(-)Diff
diff --git a/data/Dockerfiles/postfix/Dockerfile b/data/Dockerfiles/postfix/Dockerfile
index 283adbe6..2e0e73df 100644
--- a/data/Dockerfiles/postfix/Dockerfile
+++ b/data/Dockerfiles/postfix/Dockerfile
@@ -25,14 +25,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
syslog-ng \
syslog-ng-core \
syslog-ng-mod-redis \
- && rm -rf /var/lib/apt/lists/*
+ && rm -rf /var/lib/apt/lists/* \
+ && touch /etc/default/locale
RUN addgroup --system --gid 600 zeyple
RUN adduser --system --home /var/lib/zeyple --no-create-home --uid 600 --gid 600 --disabled-login zeyple
RUN touch /var/log/zeyple.log && chown zeyple: /var/log/zeyple.log
-RUN touch /etc/default/locale
-
COPY zeyple.py /usr/local/bin/zeyple.py
COPY zeyple.conf /etc/zeyple.conf
COPY supervisord.conf /etc/supervisor/supervisord.conf
diff --git a/data/Dockerfiles/postfix/supervisord.conf b/data/Dockerfiles/postfix/supervisord.conf
index 0968bb0a..55e76a95 100644
--- a/data/Dockerfiles/postfix/supervisord.conf
+++ b/data/Dockerfiles/postfix/supervisord.conf
@@ -3,19 +3,16 @@ 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
[program:postfix]
command=/opt/postfix.sh
autorestart=true
-[program:postfix-maillog]
-command=/bin/tail -f /var/log/zeyple.log /var/log/combined.log
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-
[unix_http_server]
file=/var/tmp/supervisord.sock
chmod=0770
diff --git a/data/Dockerfiles/postfix/syslog-ng.conf b/data/Dockerfiles/postfix/syslog-ng.conf
index c4bb63ba..808b06b7 100644
--- a/data/Dockerfiles/postfix/syslog-ng.conf
+++ b/data/Dockerfiles/postfix/syslog-ng.conf
@@ -13,9 +13,8 @@ source s_src {
unix-stream("/dev/log");
internal();
};
-
-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")
@@ -34,8 +33,8 @@ destination d_redis_f2b_channel {
filter f_mail { facility(mail); };
log {
source(s_src);
- destination(d_combined);
+ destination(d_stdout);
filter(f_mail);
- destination(d_redis_persistent_log);
+ destination(d_redis_ui_log);
destination(d_redis_f2b_channel);
};
diff --git a/data/Dockerfiles/postfix/zeyple.conf b/data/Dockerfiles/postfix/zeyple.conf
index 7f039582..cc176a0e 100644
--- a/data/Dockerfiles/postfix/zeyple.conf
+++ b/data/Dockerfiles/postfix/zeyple.conf
@@ -1,5 +1,5 @@
[zeyple]
-log_file = /var/log/zeyple.log
+log_file = /dev/null
[gpg]
home = /var/lib/zeyple/keys