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

[Config] Remove ejabberd from compose

master
andryyy 2021-06-30 10:14:49 +02:00
parent b08be8bc8c
commit 56c4353edb
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,7 +4,6 @@
*.iml *.iml
.idea .idea
.vscode/* .vscode/*
data/assets/ejabberd/sqlite/sqlite.db
data/assets/ssl-example/* data/assets/ssl-example/*
data/assets/ssl/* data/assets/ssl/*
data/conf/borgmatic/ data/conf/borgmatic/
@ -22,7 +21,6 @@ data/conf/dovecot/sni.conf
data/conf/dovecot/sogo-sso.conf data/conf/dovecot/sogo-sso.conf
data/conf/dovecot/sogo_trusted_ip.conf data/conf/dovecot/sogo_trusted_ip.conf
data/conf/dovecot/sql data/conf/dovecot/sql
data/conf/ejabberd/autogen/*
data/conf/nextcloud-*.bak data/conf/nextcloud-*.bak
data/conf/nginx/*.active data/conf/nginx/*.active
data/conf/nginx/*.bak data/conf/nginx/*.bak

3
generate_config.sh
View File

@ -170,9 +170,6 @@ 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_C2S_PORT=5222
XMPP_S2S_PORT=5269
XMPP_HTTPS_PORT=5443
# Your timezone # Your timezone
# See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones for a list of timezones # See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones for a list of timezones

17
update.sh
View File

@ -280,9 +280,6 @@ CONFIG_ARRAY=(
"DOVECOT_MASTER_USER" "DOVECOT_MASTER_USER"
"DOVECOT_MASTER_PASS" "DOVECOT_MASTER_PASS"
"MAILCOW_PASS_SCHEME" "MAILCOW_PASS_SCHEME"
"XMPP_C2S_PORT"
"XMPP_S2S_PORT"
"XMPP_HTTPS_PORT"
"ADDITIONAL_SERVER_NAMES" "ADDITIONAL_SERVER_NAMES"
"ACME_CONTACT" "ACME_CONTACT"
) )
@ -472,14 +469,6 @@ 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_C2S_PORT" ]]; then
if ! grep -q ${option} mailcow.conf; then
echo "XMPP_C2S_PORT=5222" >> mailcow.conf
fi
elif [[ ${option} == "XMPP_S2S_PORT" ]]; then
if ! grep -q ${option} mailcow.conf; then
echo "XMPP_S2S_PORT=5269" >> mailcow.conf
fi
elif [[ ${option} == "ADDITIONAL_SERVER_NAMES" ]]; then elif [[ ${option} == "ADDITIONAL_SERVER_NAMES" ]]; then
if ! grep -q ${option} mailcow.conf; then if ! grep -q ${option} mailcow.conf; then
echo '# Additional server names for mailcow UI' >> mailcow.conf echo '# Additional server names for mailcow UI' >> mailcow.conf
@ -491,10 +480,6 @@ for option in ${CONFIG_ARRAY[@]}; do
echo '# Comma separated list without spaces! Example: ADDITIONAL_SERVER_NAMES=a.b.c,d.e.f' >> mailcow.conf echo '# Comma separated list without spaces! Example: ADDITIONAL_SERVER_NAMES=a.b.c,d.e.f' >> mailcow.conf
echo 'ADDITIONAL_SERVER_NAMES=' >> mailcow.conf echo 'ADDITIONAL_SERVER_NAMES=' >> mailcow.conf
fi fi
elif [[ ${option} == "XMPP_HTTPS_PORT" ]]; then
if ! grep -q ${option} mailcow.conf; then
echo "XMPP_HTTPS_PORT=5443" >> mailcow.conf
fi
elif [[ ${option} == "ACME_CONTACT" ]]; then elif [[ ${option} == "ACME_CONTACT" ]]; then
if ! grep -q ${option} mailcow.conf; then if ! grep -q ${option} mailcow.conf; then
echo '# Lets Encrypt registration contact information' >> mailcow.conf echo '# Lets Encrypt registration contact information' >> mailcow.conf
@ -579,8 +564,6 @@ for container in "${MAILCOW_CONTAINERS[@]}"; do
docker rm -f "$container" 2> /dev/null docker rm -f "$container" 2> /dev/null
done done
[[ -f data/conf/nginx/ejabberd.conf ]] && mv data/conf/nginx/ejabberd.conf data/conf/nginx/ZZZ-ejabberd.conf
# Silently fixing remote url from andryyy to mailcow # Silently fixing remote url from andryyy to mailcow
git remote set-url origin https://github.com/mailcow/mailcow-dockerized git remote set-url origin https://github.com/mailcow/mailcow-dockerized
echo -e "\e[32mCommitting current status...\e[0m" echo -e "\e[32mCommitting current status...\e[0m"