Restart SOGo from within panel

data/Dockerfiles/php-fpm/Dockerfile

@@ -4,10 +4,10 @@ MAINTAINER Andre Peters <andre.peters@servercow.de>
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update \
-        && apt-get install -y zlib1g-dev libicu-dev g++ libidn11-dev
+        && apt-get install -y zlib1g-dev libicu-dev g++ libidn11-dev libxml2-dev
 
 RUN docker-php-ext-configure intl
-RUN docker-php-ext-install intl pdo pdo_mysql
+RUN docker-php-ext-install intl pdo pdo_mysql xmlrpc
 
 COPY ./docker-entrypoint.sh /
 

data/Dockerfiles/sogo/Dockerfile

@@ -32,12 +32,12 @@ RUN echo '* * * * *   sogo   /usr/sbin/sogo-ealarms-notify' > /etc/cron.d/sogo
 RUN echo '* * * * *   sogo   /usr/sbin/sogo-tool expire-sessions 60' >> /etc/cron.d/sogo
 RUN echo '0 0 * * *   sogo   /usr/sbin/sogo-tool update-autoreply -p /etc/sogo/sieve.creds' >> /etc/cron.d/sogo
 
-COPY ./docker-entrypoint.sh /
+COPY ./reconf-domains.sh /
 COPY supervisord.conf /etc/supervisor/supervisord.conf
 
 EXPOSE 20000
+EXPOSE 9191
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
 
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

data/Dockerfiles/sogo/reconf-domains.sh

@@ -1,14 +1,17 @@
 #!/bin/bash
 
-# Wait for MySQL to warm-up
-while ! mysqladmin ping --host mysql --silent; do
-	sleep 1
-done
+# Go in a 5 minute loop
+while true; do
 
-mkdir -p /var/lib/sogo/GNUstep/Defaults/
+	# Wait for MySQL to warm-up
+	while ! mysqladmin ping --host mysql --silent; do
+		sleep 1
+	done
 
-# Generate plist header with timezone data
-cat <<EOF > /var/lib/sogo/GNUstep/Defaults/sogod.plist
+	mkdir -p /var/lib/sogo/GNUstep/Defaults/
+
+	# Generate plist header with timezone data
+	cat <<EOF > /var/lib/sogo/GNUstep/Defaults/sogod.plist
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//GNUstep//DTD plist 0.9//EN" "http://www.gnustep.org/plist-0_9.xml">
 <plist version="0.9">
@@ -33,11 +36,11 @@ cat <<EOF > /var/lib/sogo/GNUstep/Defaults/sogod.plist
     <dict>
 EOF
 
-# Generate multi-domain setup
-while read line
-do
-DOMAIN_SANE=$(echo ${line} | tr '-' 'b' | tr '.' 'p' | tr -cd '[[:alnum:]]')
-echo "        <key>${line}</key>
+	# Generate multi-domain setup
+	while read line
+	do
+	DOMAIN_SANE=$(echo ${line} | tr '-' 'b' | tr '.' 'p' | tr -cd '[[:alnum:]]')
+	echo "        <key>${line}</key>
         <dict>
             <key>SOGoMailDomain</key>
             <string>$(echo ${line} | tr '-' 'b' | tr '.' 'p')</string>
@@ -73,8 +76,8 @@ echo "        <key>${line}</key>
                 </dict>
             </array>
         </dict>" >> /var/lib/sogo/GNUstep/Defaults/sogod.plist
-mysql --host mysql -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "DROP VIEW IF EXISTS sogo_view_${DOMAIN_SANE}"
-mysql --host mysql -u ${DBUSER} -p${DBPASS} ${DBNAME} << EOF
+	mysql --host mysql -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "DROP VIEW IF EXISTS sogo_view_${DOMAIN_SANE}"
+	mysql --host mysql -u ${DBUSER} -p${DBPASS} ${DBNAME} << EOF
 CREATE VIEW sogo_view_${DOMAIN_SANE} (c_uid, c_name, c_password, c_cn, mail, aliases, ad_aliases, senderacl, home) AS
 SELECT mailbox.username, mailbox.username, mailbox.password, mailbox.name, mailbox.username, IFNULL(ga.aliases, ''), IFNULL(gda.ad_alias, ''), IFNULL(gs.send_as, ''), CONCAT('/var/vmail/', maildir) FROM mailbox
 LEFT OUTER JOIN grouped_mail_aliases ga ON ga.username = mailbox.username
@@ -84,13 +87,15 @@ WHERE mailbox.active = '1' AND domain = '${line}';
 EOF
 done < <(mysql --host mysql -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT domain FROM domain;" -B -N)
 
-# Generate footer
-echo '    </dict>
+	# Generate footer
+	echo '    </dict>
 </dict>
 </plist>' >> /var/lib/sogo/GNUstep/Defaults/sogod.plist
 
-# Fix permissions
-chown sogo:sogo -R /var/lib/sogo/
-chmod 600 /var/lib/sogo/GNUstep/Defaults/sogod.plist
+	# Fix permissions
+	chown sogo:sogo -R /var/lib/sogo/
+	chmod 600 /var/lib/sogo/GNUstep/Defaults/sogod.plist
 
-exec "$@"
+	sleep 300
+
+done

data/Dockerfiles/sogo/supervisord.conf

@@ -7,10 +7,19 @@ redirect_stderr=true
 autostart=true
 stdout_syslog=true
 
+[group:sogo-group]
+programs=reconf-domains,sogo
+
 [program:sogo]
 command=/usr/sbin/sogod
 user=sogo
 autorestart=true
+priority=20
+
+[program:reconf-domains]
+command=/reconf-domains.sh
+autorestart=true
+priority=10
 
 [program:sogo-syslog]
 command=/usr/bin/tail -f /var/log/syslog -f /var/log/sogo/sogo.log
@@ -21,6 +30,11 @@ stdout_logfile_maxbytes=0
 command=/usr/sbin/cron -f
 autorestart=true
 
-#[unix_http_server]
-#file=/var/run/controller/supervisord.sock
-#chown=www-data:nogroup
+[inet_http_server]
+port=9191
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=http://localhost:9191