diff --git a/data/Dockerfiles/dockerapi/server.py b/data/Dockerfiles/dockerapi/server.py index 027c2f00..ede9433c 100644 --- a/data/Dockerfiles/dockerapi/server.py +++ b/data/Dockerfiles/dockerapi/server.py @@ -228,7 +228,7 @@ class container_post(Resource): container.restart() return jsonify(type='warning', msg='mysql_upgrade: upgrade was applied', text=sql_return.output.decode('utf-8')) else: - return jsonify(type='error', msg='mysql_upgrade: error running command') + return jsonify(type='error', msg='mysql_upgrade: error running command', text=sql_return.output.decode('utf-8')) # api call: container_post - post_action: exec - cmd: reload - task: dovecot diff --git a/data/Dockerfiles/phpfpm/Dockerfile b/data/Dockerfiles/phpfpm/Dockerfile index ea8502d7..b4c60308 100644 --- a/data/Dockerfiles/phpfpm/Dockerfile +++ b/data/Dockerfiles/phpfpm/Dockerfile @@ -63,6 +63,9 @@ RUN apk add -U --no-cache autoconf \ && docker-php-ext-install -j 4 exif gd gettext intl ldap opcache pcntl pdo pdo_mysql soap sockets xmlrpc zip \ && docker-php-ext-configure imap --with-imap --with-imap-ssl \ && docker-php-ext-install -j 4 imap \ + && curl --silent --show-error https://getcomposer.org/installer | php \ + && mv composer.phar /usr/local/bin/composer \ + && chmod +x /usr/local/bin/composer \ && apk del --purge autoconf \ cyrus-sasl-dev \ freetype-dev \ diff --git a/data/Dockerfiles/phpfpm/docker-entrypoint.sh b/data/Dockerfiles/phpfpm/docker-entrypoint.sh index 11088ad8..5a27119c 100755 --- a/data/Dockerfiles/phpfpm/docker-entrypoint.sh +++ b/data/Dockerfiles/phpfpm/docker-entrypoint.sh @@ -57,7 +57,8 @@ until [[ ${SQL_UPGRADE_STATUS} == 'success' ]]; do echo "MySQL is up-to-date - debug output:" echo ${SQL_FULL_UPGRADE_RETURN} else - echo "No valid reponse for mysql_upgrade was received" + echo "No valid reponse for mysql_upgrade was received, debug output:" + echo ${SQL_FULL_UPGRADE_RETURN} fi done diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf index f7238631..98e81a34 100644 --- a/data/conf/postfix/main.cf +++ b/data/conf/postfix/main.cf @@ -149,7 +149,7 @@ smtpd_tls_protocols = !SSLv2, !SSLv3 smtpd_tls_security_level = may tls_preempt_cipherlist = yes -tls_ssl_options = NO_COMPRESSION +tls_ssl_options = NO_COMPRESSION, NO_RENEGOTIATION virtual_alias_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_alias_maps.cf, proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_resource_maps.cf, proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_spamalias_maps.cf, diff --git a/data/web/admin.php b/data/web/admin.php index 5c79aab4..155c6fc1 100644 --- a/data/web/admin.php +++ b/data/web/admin.php @@ -974,6 +974,10 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC +