[mailcow] Fix C22 -> C2S
parent
f2453e316f
commit
5809e5b82e
|
@ -140,7 +140,7 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
|
|||
$records[] = array(
|
||||
'_xmpp-client._tcp.' . $domain_details['xmpp_prefix'] . '.' . $domain,
|
||||
'SRV',
|
||||
$mailcow_hostname . ' ' . array_pop(explode(':', getenv('XMPP_C22_PORT')))
|
||||
$mailcow_hostname . ' ' . array_pop(explode(':', getenv('XMPP_C2S_PORT')))
|
||||
);
|
||||
$records[] = array(
|
||||
'_xmpp-server._tcp.' . $domain_details['xmpp_prefix'] . '.' . $domain,
|
||||
|
|
|
@ -146,7 +146,7 @@ services:
|
|||
- SUBMISSION_PORT=${SUBMISSION_PORT:-587}
|
||||
- SMTPS_PORT=${SMTPS_PORT:-465}
|
||||
- SMTP_PORT=${SMTP_PORT:-25}
|
||||
- XMPP_C22_PORT=${XMPP_C22_PORT:-5222}
|
||||
- XMPP_C2S_PORT=${XMPP_C2S_PORT:-5222}
|
||||
- XMPP_S2S_PORT=${XMPP_S2S_PORT:-5269}
|
||||
- API_KEY=${API_KEY:-invalid}
|
||||
- API_KEY_READ_ONLY=${API_KEY_READ_ONLY:-invalid}
|
||||
|
@ -551,7 +551,7 @@ services:
|
|||
- DBUSER=${DBUSER}
|
||||
- DBPASS=${DBPASS}
|
||||
ports:
|
||||
- "${XMPP_C22_PORT:-5222}:5222"
|
||||
- "${XMPP_C2S_PORT:-5222}:5222"
|
||||
- "${XMPP_S2S_PORT:-5269}:5269"
|
||||
- "${XMPP_HTTPS_PORT:-5443}:5443"
|
||||
networks:
|
||||
|
|
|
@ -170,7 +170,7 @@ DOVEADM_PORT=127.0.0.1:19991
|
|||
SQL_PORT=127.0.0.1:13306
|
||||
SOLR_PORT=127.0.0.1:18983
|
||||
REDIS_PORT=127.0.0.1:7654
|
||||
XMPP_C22_PORT=5222
|
||||
XMPP_C2S_PORT=5222
|
||||
XMPP_S2S_PORT=5269
|
||||
|
||||
# Your timezone
|
||||
|
|
|
@ -218,7 +218,7 @@ CONFIG_ARRAY=(
|
|||
"DOVECOT_MASTER_USER"
|
||||
"DOVECOT_MASTER_PASS"
|
||||
"MAILCOW_PASS_SCHEME"
|
||||
"XMPP_C22_PORT"
|
||||
"XMPP_C2S_PORT"
|
||||
"XMPP_S2S_PORT"
|
||||
)
|
||||
|
||||
|
@ -401,9 +401,9 @@ for option in ${CONFIG_ARRAY[@]}; do
|
|||
echo '# see https://mailcow.github.io/mailcow-dockerized-docs/model-passwd/' >> mailcow.conf
|
||||
echo "MAILCOW_PASS_SCHEME=BLF-CRYPT" >> mailcow.conf
|
||||
fi
|
||||
elif [[ ${option} == "XMPP_C22_PORT" ]]; then
|
||||
elif [[ ${option} == "XMPP_C2S_PORT" ]]; then
|
||||
if ! grep -q ${option} mailcow.conf; then
|
||||
echo "XMPP_C22_PORT=5222" >> mailcow.conf
|
||||
echo "XMPP_C2S_PORT=5222" >> mailcow.conf
|
||||
fi
|
||||
elif [[ ${option} == "XMPP_S2S_PORT" ]]; then
|
||||
if ! grep -q ${option} mailcow.conf; then
|
||||
|
|
Loading…
Reference in New Issue