diff --git a/docker-compose.yml b/docker-compose.yml index a6988ef..4e0238a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: build: dockerfile: ireddocker/Dockerfile context: ireddocker/ - image: ireddocker:0.1 + image: ireddocker:0.3 container_name: iredmail-mail hostname: mail.recsds.spbsut.ru env_file: diff --git a/ireddocker/dockerinit.sh b/ireddocker/dockerinit.sh index e205514..2dd9ee9 100644 --- a/ireddocker/dockerinit.sh +++ b/ireddocker/dockerinit.sh @@ -311,12 +311,50 @@ EOF # Replace certs + if [[ X"${CUSTOM_CERT_USE}" == X'YES' || X"${CUSTOM_CERT_USE}" == X'yes' ]]; then - rm -f /etc/ssl/private/iRedMail.key - rm -f /etc/ssl/certs/iRedMail.crt - ln -s /opt/iredmail/ssl/$CUSTOM_CERT_KEYFILE /etc/ssl/private/iRedMail.key - ln -s /opt/iredmail/ssl/$CUSTOM_CERT_CERTFILE /etc/ssl/certs/iRedMail.crt - fi + rm -f /etc/ssl/private/iRedMail.key + rm -f /etc/ssl/certs/iRedMail.crt + mv /tmp/cert/$CUSTOM_CERT_KEYFILE /opt/iredmail/ssl/$CUSTOM_CERT_KEYFILE + mv /tmp/cert/$CUSTOM_CERT_CERTFILE /opt/iredmail/ssl/$CUSTOM_CERT_CERTFILE + ln -s /opt/iredmail/ssl/$CUSTOM_CERT_KEYFILE /etc/ssl/private/iRedMail.key + ln -s /opt/iredmail/ssl/$CUSTOM_CERT_CERTFILE /etc/ssl/certs/iRedMail.crt + fi + + +# Start syslog-ng + + /usr/sbin/syslog-ng -F --no-caps & + + + if [[ X"${MYSQLEXIST}" != X'YES' || X"${MYSQLEXIST}" != X'yes' ]]; then + service mysql restart + fi + + service dovecot restart + + mkdir /run/php + service php7.2-fpm restart + +# Start postfix + start-stop-daemon --start --exec /usr/sbin/postmulti -- -i - -x /usr/sbin/postfix quiet-quick-start + + service clamav-daemon restart + service clamav-freshclam restart + service spamassasin restart + service amavis restart + service uwsgi restart + service nginx restart + + if [[ X"${LDAP_EXTERNAL_USE}" != X'YES' || X"${LDAP_EXTERNAL_USE}" != X'yes' ]]; then + service slapd restart + service iredapd restart + fi + + while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do + sleep 1 + done + else #does not start, if mysql stopped