diff --git a/data/Dockerfiles/postfix/Dockerfile b/data/Dockerfiles/postfix/Dockerfile index 43ed1c27..c818da63 100644 --- a/data/Dockerfiles/postfix/Dockerfile +++ b/data/Dockerfiles/postfix/Dockerfile @@ -15,6 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ dirmngr \ gnupg \ libsasl2-modules \ + perl \ postfix \ postfix-mysql \ postfix-pcre \ @@ -30,9 +31,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && printf '#!/bin/bash\n/usr/sbin/postconf -c /opt/postfix/conf "$@"' > /usr/local/sbin/postconf \ && chmod +x /usr/local/sbin/postconf -RUN addgroup --system --gid 600 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 addgroup --system --gid 600 zeyple \ + && adduser --system --home /var/lib/zeyple --no-create-home --uid 600 --gid 600 --disabled-login zeyple \ + && touch /var/log/zeyple.log \ + && chown zeyple: /var/log/zeyple.log \ + && mkdir -p /opt/mailman/var/data \ + && touch /opt/mailman/var/data/postfix_lmtp \ + && touch /opt/mailman/var/data/postfix_domains COPY zeyple.py /usr/local/bin/zeyple.py COPY zeyple.conf /etc/zeyple.conf diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf index a4a58e62..8db1dd03 100644 --- a/data/conf/postfix/main.cf +++ b/data/conf/postfix/main.cf @@ -3,6 +3,7 @@ append_dot_mydomain = no smtpd_tls_cert_file = /etc/ssl/mail/cert.pem smtpd_tls_key_file = /etc/ssl/mail/key.pem smtpd_use_tls=yes +smtpd_tls_received_header = yes smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination diff --git a/data/conf/sogo/sogo.conf b/data/conf/sogo/sogo.conf index 40e3928c..d1cdd439 100644 --- a/data/conf/sogo/sogo.conf +++ b/data/conf/sogo/sogo.conf @@ -5,7 +5,7 @@ PrivateDAndTViewer ); - WOWorkersCount = "14"; + WOWorkersCount = "20"; SOGoACLsSendEMailNotifications = YES; SOGoAppointmentSendEMailNotifications = YES; SOGoDraftsFolderName = "Drafts"; diff --git a/data/web/debug.php b/data/web/debug.php index 09616791..ea9672b8 100644 --- a/data/web/debug.php +++ b/data/web/debug.php @@ -292,13 +292,13 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
- +
- +
diff --git a/data/web/inc/functions.docker.inc.php b/data/web/inc/functions.docker.inc.php index 11747f25..c8401da6 100644 --- a/data/web/inc/functions.docker.inc.php +++ b/data/web/inc/functions.docker.inc.php @@ -7,7 +7,7 @@ function docker($service_name, $action, $attr1 = null, $attr2 = null, $extra_hea curl_setopt($curl, CURLOPT_URL, 'http://dockerapi:8080/containers/json'); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_POST, 0); - curl_setopt($curl, CURLOPT_TIMEOUT, 4); + curl_setopt($curl, CURLOPT_TIMEOUT, 10); $response = curl_exec($curl); if ($response === false) { $err = curl_error($curl); @@ -33,7 +33,7 @@ function docker($service_name, $action, $attr1 = null, $attr2 = null, $extra_hea curl_setopt($curl, CURLOPT_URL, 'http://dockerapi:8080/containers/' . $container_id . '/json'); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_POST, 0); - curl_setopt($curl, CURLOPT_TIMEOUT, 4); + curl_setopt($curl, CURLOPT_TIMEOUT, 10); $response = curl_exec($curl); if ($response === false) { $err = curl_error($curl); @@ -60,7 +60,7 @@ function docker($service_name, $action, $attr1 = null, $attr2 = null, $extra_hea if (ctype_xdigit($container_id) && ctype_alnum($attr1)) { curl_setopt($curl, CURLOPT_URL, 'http://dockerapi:8080/containers/' . $container_id . '/' . $attr1); curl_setopt($curl, CURLOPT_POST, 1); - curl_setopt($curl, CURLOPT_TIMEOUT, 4); + curl_setopt($curl, CURLOPT_TIMEOUT, 10); if (!empty($attr2)) { curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($attr2)); } @@ -87,4 +87,4 @@ function docker($service_name, $action, $attr1 = null, $attr2 = null, $extra_hea } break; } -} \ No newline at end of file +}