mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2025-09-25 00:02:44 -04:00
Compare commits
No commits in common. "master" and "2025-09a" have entirely different histories.
@ -24,10 +24,6 @@ while [[ "${DBV_NOW}" != "${DBV_NEW}" ]]; do
|
|||||||
done
|
done
|
||||||
echo "DB schema is ${DBV_NOW}"
|
echo "DB schema is ${DBV_NOW}"
|
||||||
|
|
||||||
if [[ "${MASTER}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
|
|
||||||
mariadb --skip-ssl --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "DROP TRIGGER IF EXISTS sogo_update_password"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# cat /dev/urandom seems to hang here occasionally and is not recommended anyway, better use openssl
|
# cat /dev/urandom seems to hang here occasionally and is not recommended anyway, better use openssl
|
||||||
RAND_PASS=$(openssl rand -base64 16 | tr -dc _A-Z-a-z-0-9)
|
RAND_PASS=$(openssl rand -base64 16 | tr -dc _A-Z-a-z-0-9)
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ http {
|
|||||||
{%endif%}
|
{%endif%}
|
||||||
listen {{ HTTPS_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%} ssl;
|
listen {{ HTTPS_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%} ssl;
|
||||||
|
|
||||||
{% if ENABLE_IPV6 %}
|
{% if not DISABLE_IPv6 %}
|
||||||
{% if not HTTP_REDIRECT %}
|
{% if not HTTP_REDIRECT %}
|
||||||
listen [::]:{{ HTTP_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%};
|
listen [::]:{{ HTTP_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%};
|
||||||
{%endif%}
|
{%endif%}
|
||||||
@ -105,7 +105,7 @@ http {
|
|||||||
{%endif%}
|
{%endif%}
|
||||||
listen {{ HTTPS_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%} ssl;
|
listen {{ HTTPS_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%} ssl;
|
||||||
|
|
||||||
{% if ENABLE_IPV6 %}
|
{% if not DISABLE_IPv6 %}
|
||||||
{% if not HTTP_REDIRECT %}
|
{% if not HTTP_REDIRECT %}
|
||||||
listen [::]:{{ HTTP_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%};
|
listen [::]:{{ HTTP_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%};
|
||||||
{%endif%}
|
{%endif%}
|
||||||
@ -126,7 +126,7 @@ http {
|
|||||||
# rspamd dynmaps:
|
# rspamd dynmaps:
|
||||||
server {
|
server {
|
||||||
listen 8081;
|
listen 8081;
|
||||||
{% if ENABLE_IPV6 %}
|
{% if not DISABLE_IPv6 %}
|
||||||
listen [::]:8081;
|
listen [::]:8081;
|
||||||
{%endif%}
|
{%endif%}
|
||||||
index index.php index.html;
|
index index.php index.html;
|
||||||
@ -199,7 +199,7 @@ http {
|
|||||||
{%endif%}
|
{%endif%}
|
||||||
listen {{ HTTPS_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%} ssl;
|
listen {{ HTTPS_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%} ssl;
|
||||||
|
|
||||||
{% if ENABLE_IPV6 %}
|
{% if not DISABLE_IPv6 %}
|
||||||
{% if not HTTP_REDIRECT %}
|
{% if not HTTP_REDIRECT %}
|
||||||
listen [::]:{{ HTTP_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%};
|
listen [::]:{{ HTTP_PORT }}{% if NGINX_USE_PROXY_PROTOCOL %} proxy_protocol{%endif%};
|
||||||
{%endif%}
|
{%endif%}
|
||||||
|
@ -1949,6 +1949,11 @@ jQuery(function($){
|
|||||||
defaultContent: '',
|
defaultContent: '',
|
||||||
responsivePriority: 5,
|
responsivePriority: 5,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: lang.bcc_destinations,
|
||||||
|
data: 'bcc_dest',
|
||||||
|
defaultContent: ''
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: lang.sogo_visible,
|
title: lang.sogo_visible,
|
||||||
data: 'sogo_visible',
|
data: 'sogo_visible',
|
||||||
|
@ -200,7 +200,7 @@ services:
|
|||||||
- phpfpm
|
- phpfpm
|
||||||
|
|
||||||
sogo-mailcow:
|
sogo-mailcow:
|
||||||
image: ghcr.io/mailcow/sogo:1.135
|
image: ghcr.io/mailcow/sogo:1.134
|
||||||
environment:
|
environment:
|
||||||
- DBNAME=${DBNAME}
|
- DBNAME=${DBNAME}
|
||||||
- DBUSER=${DBUSER}
|
- DBUSER=${DBUSER}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user