paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Postfix] Do not keep persistent logs in a container

master
andryyy 2017-07-11 17:09:20 +02:00
parent a31819fd6c
commit f8ae5158cb
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/Dockerfiles/postfix/Dockerfile
View File

@ -25,14 +25,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
syslog-ng \ syslog-ng \
syslog-ng-core \ syslog-ng-core \
syslog-ng-mod-redis \ 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 addgroup --system --gid 600 zeyple
RUN adduser --system --home /var/lib/zeyple --no-create-home --uid 600 --gid 600 --disabled-login 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 /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.py /usr/local/bin/zeyple.py
COPY zeyple.conf /etc/zeyple.conf COPY zeyple.conf /etc/zeyple.conf
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /etc/supervisor/supervisord.conf

11
data/Dockerfiles/postfix/supervisord.conf
View File

@ -3,19 +3,16 @@ nodaemon=true
[program:syslog-ng] [program:syslog-ng]
command=/usr/sbin/syslog-ng --foreground --no-caps 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 autostart=true
stdout_syslog=true
[program:postfix] [program:postfix]
command=/opt/postfix.sh command=/opt/postfix.sh
autorestart=true 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] [unix_http_server]
file=/var/tmp/supervisord.sock file=/var/tmp/supervisord.sock
chmod=0770 chmod=0770

9
data/Dockerfiles/postfix/syslog-ng.conf
View File

@ -13,9 +13,8 @@ source s_src {
unix-stream("/dev/log"); unix-stream("/dev/log");
internal(); internal();
}; };
destination d_stdout { pipe("/dev/stdout"); };
destination d_combined { file("/var/log/combined.log"); }; destination d_redis_ui_log {
destination d_redis_persistent_log {
redis( redis(
host("redis-mailcow") host("redis-mailcow")
persist-name("redis1") persist-name("redis1")
@ -34,8 +33,8 @@ destination d_redis_f2b_channel {
filter f_mail { facility(mail); }; filter f_mail { facility(mail); };
log { log {
source(s_src); source(s_src);
destination(d_combined); destination(d_stdout);
filter(f_mail); filter(f_mail);
destination(d_redis_persistent_log); destination(d_redis_ui_log);
destination(d_redis_f2b_channel); destination(d_redis_f2b_channel);
}; };

2
data/Dockerfiles/postfix/zeyple.conf
View File

@ -1,5 +1,5 @@
[zeyple] [zeyple]
log_file = /var/log/zeyple.log log_file = /dev/null
[gpg] [gpg]
home = /var/lib/zeyple/keys home = /var/lib/zeyple/keys