public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

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

Finally fix SOGo race condition

863a0e4d

andryyy <[email protected]> 9 years ago

data/Dockerfiles/sogo/Dockerfile       |  1 +
 data/Dockerfiles/sogo/supervisord.conf | 32 ++++++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

Diff

diff --git a/data/Dockerfiles/sogo/Dockerfile b/data/Dockerfiles/sogo/Dockerfile
index adc0f66d..88617816 100644
--- a/data/Dockerfiles/sogo/Dockerfile
+++ b/data/Dockerfiles/sogo/Dockerfile
@@ -44,6 +44,7 @@ RUN mkdir /usr/share/doc/sogo \
 COPY ./reconf-domains.sh /
 COPY syslog-ng.conf /etc/syslog-ng/syslog-ng.conf
 COPY supervisord.conf /etc/supervisor/supervisord.conf
+COPY event-listener-ordered-startup.py /usr/local/bin/event-listener-ordered-startup.py
 
 CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
 
diff --git a/data/Dockerfiles/sogo/supervisord.conf b/data/Dockerfiles/sogo/supervisord.conf
index dbb2d5a3..1d719096 100644
--- a/data/Dockerfiles/sogo/supervisord.conf
+++ b/data/Dockerfiles/sogo/supervisord.conf
@@ -6,32 +6,36 @@ command=/usr/sbin/syslog-ng --foreground  --no-caps
 redirect_stderr=true
 autostart=true
 stdout_syslog=true
+priority=1
 
-[program:sogo]
-command=sh -c "sleep 3; /usr/sbin/sogod"
+[program:cron]
+command=/usr/sbin/cron -f
+autorestart=true
+priority=2
+
+[program:sogo-webres]
+command=/usr/bin/python -u -m SimpleHTTPServer 9192
+directory=/usr/lib/GNUstep/SOGo/
 user=sogo
 autorestart=true
-priority=20
+priority=4
 
 [program:reconf-domains]
 command=/reconf-domains.sh
+priority=3
+autorestart=true
+
+[program:sogo]
+command=sh -c "sleep 5; /usr/sbin/sogod"
+user=sogo
 autorestart=true
-priority=10
+priority=5
 
 [program:sogo-syslog]
 command=/usr/bin/tail -f /var/log/combined.log
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
-
-[program:cron]
-command=/usr/sbin/cron -f
-autorestart=true
-
-[program:sogo-webres]
-command=/usr/bin/python -u -m SimpleHTTPServer 9192
-directory=/usr/lib/GNUstep/SOGo/
-user=sogo
-autorestart=true
+priority=6
 
 [inet_http_server]
 port=9191