paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[mailcow] Fix C22 -> C2S

master
andryyy 2021-02-12 11:22:43 +01:00
parent f2453e316f
commit 5809e5b82e
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/web/inc/ajax/dns_diagnostics.php
View File

@ -140,7 +140,7 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
$records[] = array( $records[] = array(
'_xmpp-client._tcp.' . $domain_details['xmpp_prefix'] . '.' . $domain, '_xmpp-client._tcp.' . $domain_details['xmpp_prefix'] . '.' . $domain,
'SRV', 'SRV',
$mailcow_hostname . ' ' . array_pop(explode(':', getenv('XMPP_C22_PORT'))) $mailcow_hostname . ' ' . array_pop(explode(':', getenv('XMPP_C2S_PORT')))
); );
$records[] = array( $records[] = array(
'_xmpp-server._tcp.' . $domain_details['xmpp_prefix'] . '.' . $domain, '_xmpp-server._tcp.' . $domain_details['xmpp_prefix'] . '.' . $domain,

4
docker-compose.yml
View File

@ -146,7 +146,7 @@ services:
- SUBMISSION_PORT=${SUBMISSION_PORT:-587} - SUBMISSION_PORT=${SUBMISSION_PORT:-587}
- SMTPS_PORT=${SMTPS_PORT:-465} - SMTPS_PORT=${SMTPS_PORT:-465}
- SMTP_PORT=${SMTP_PORT:-25} - 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} - XMPP_S2S_PORT=${XMPP_S2S_PORT:-5269}
- API_KEY=${API_KEY:-invalid} - API_KEY=${API_KEY:-invalid}
- API_KEY_READ_ONLY=${API_KEY_READ_ONLY:-invalid} - API_KEY_READ_ONLY=${API_KEY_READ_ONLY:-invalid}
@ -551,7 +551,7 @@ services:
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
ports: ports:
- "${XMPP_C22_PORT:-5222}:5222" - "${XMPP_C2S_PORT:-5222}:5222"
- "${XMPP_S2S_PORT:-5269}:5269" - "${XMPP_S2S_PORT:-5269}:5269"
- "${XMPP_HTTPS_PORT:-5443}:5443" - "${XMPP_HTTPS_PORT:-5443}:5443"
networks: networks:

2
generate_config.sh
View File

@ -170,7 +170,7 @@ DOVEADM_PORT=127.0.0.1:19991
SQL_PORT=127.0.0.1:13306 SQL_PORT=127.0.0.1:13306
SOLR_PORT=127.0.0.1:18983 SOLR_PORT=127.0.0.1:18983
REDIS_PORT=127.0.0.1:7654 REDIS_PORT=127.0.0.1:7654
XMPP_C22_PORT=5222 XMPP_C2S_PORT=5222
XMPP_S2S_PORT=5269 XMPP_S2S_PORT=5269
# Your timezone # Your timezone

6
update.sh
View File

@ -218,7 +218,7 @@ CONFIG_ARRAY=(
"DOVECOT_MASTER_USER" "DOVECOT_MASTER_USER"
"DOVECOT_MASTER_PASS" "DOVECOT_MASTER_PASS"
"MAILCOW_PASS_SCHEME" "MAILCOW_PASS_SCHEME"
"XMPP_C22_PORT" "XMPP_C2S_PORT"
"XMPP_S2S_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 '# see https://mailcow.github.io/mailcow-dockerized-docs/model-passwd/' >> mailcow.conf
echo "MAILCOW_PASS_SCHEME=BLF-CRYPT" >> mailcow.conf echo "MAILCOW_PASS_SCHEME=BLF-CRYPT" >> mailcow.conf
fi fi
elif [[ ${option} == "XMPP_C22_PORT" ]]; then elif [[ ${option} == "XMPP_C2S_PORT" ]]; then
if ! grep -q ${option} mailcow.conf; then if ! grep -q ${option} mailcow.conf; then
echo "XMPP_C22_PORT=5222" >> mailcow.conf echo "XMPP_C2S_PORT=5222" >> mailcow.conf
fi fi
elif [[ ${option} == "XMPP_S2S_PORT" ]]; then elif [[ ${option} == "XMPP_S2S_PORT" ]]; then
if ! grep -q ${option} mailcow.conf; then if ! grep -q ${option} mailcow.conf; then