Hello all,
I am a newbie user of mailcow. And I need some pointers of what to do after a botched update.

Yesterday after I did an upgrade my mailcow installation started to give me XMPP errors when I created aliases so I decided to roll back.

I followed the instructions found here https://mailcow.github.io/mailcow-dockerized-docs/i_u_m_update/

And I did:


# cd /opt/mailcow-dockerized
# git log --pretty=oneline | grep -i "before update"
64c8aa5b9a343a362159d3c1c85cec9a4477f037 Before update on 2021-02-11_18_55_39
57630da24038f2491fd68850bf964107d7038406 Before update on 2021-02-10_15_02_39
f7ff93a499e51cc603145757c80a495d015c9640 [Update] Stop mailcow before update
00395b99c68ae89ed8d5a83c2e9270641a6f2db0 Fetch origin before update check
# docker-compose down
# git checkout 64c8aa5b9a343a362159d3c1c85cec9a4477f037
Note: checking out '64c8aa5b9a343a362159d3c1c85cec9a4477f037'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD is now at 64c8aa5b Before update on 2021-02-11_18_55_39

# docker-compose pull
# docker-compose up -d

After this commands the mailsystem started to behave correctly.

Today I tried to update it again but it fails like this:

# ./update.sh 
Checking internet connection... OK
Checking for newer update script...
Are you sure you want to update mailcow: dockerized? All containers will be stopped. [y/N] y
Validating docker-compose stack configuration...
Checking for conflicting bridges...
# Warning: iptables-legacy tables present, use iptables-legacy to see them
Saving diff to update_diffs/diff_before_update_2021-02-12-11-42-03...
Prefetching images...
1.12: Pulling from mailcow/unbound
Digest: sha256:524a030c71acacddd2e9aa139fc26c6cada073ced65fcb2792320f15ff4c4848
Status: Image is up to date for mailcow/unbound:1.12
docker.io/mailcow/unbound:1.12
10.4: Pulling from library/mariadb
Digest: sha256:cdcbe6cea1d2a0276f0f6432f8964de7be5ce8eb4d9b20dea45daa4be1305911
Status: Image is up to date for mariadb:10.4
docker.io/library/mariadb:10.4
5-alpine: Pulling from library/redis
Digest: sha256:77b02ad41a6a64a4df86e5037b5f59e18b844b5d9f4b9ef84ab2e81d18525d32
Status: Image is up to date for redis:5-alpine
docker.io/library/redis:5-alpine
1.38: Pulling from mailcow/clamd
Digest: sha256:ec01699cf8f13f730dedfcb404a5931adc9d189c47d3110aea6665340c163161
Status: Image is up to date for mailcow/clamd:1.38
docker.io/mailcow/clamd:1.38
1.76: Pulling from mailcow/rspamd
Digest: sha256:638b957e880b3b61cf78ac8c23520273644de53b6d8ead389f10da3a726e6f89
Status: Image is up to date for mailcow/rspamd:1.76
docker.io/mailcow/rspamd:1.76
1.71: Pulling from mailcow/phpfpm
0a6724ff3fcd: Already exists 
30177fe68f41: Already exists 
5c3561a9c216: Already exists 
aea44d2ba8a0: Already exists 
2d7da1685dd0: Already exists 
cf020ae2e024: Already exists 
6f414937377f: Already exists 
4af7880bca00: Already exists 
3d68fa9f04ea: Already exists 
bfd8bbb1c7d5: Already exists 
5f4679c07051: Already exists 
3e6f3f0e481a: Pull complete 
Digest: sha256:2d9721d63680b51b39444d504494707bf93a319d19c98cc8fd0b9abbfa5a104f
Status: Downloaded newer image for mailcow/phpfpm:1.71
docker.io/mailcow/phpfpm:1.71
1.95: Pulling from mailcow/sogo
Digest: sha256:78da9f3c60fea631750cb0a3b705ca499a522b2bbdfdb573739796dc563b49a3
Status: Image is up to date for mailcow/sogo:1.95
docker.io/mailcow/sogo:1.95
1.140: Pulling from mailcow/dovecot
Digest: sha256:a7a903400ab486d2993372fcedfd88aa85054d1275c8b44e269f5ce6387e03e5
Status: Image is up to date for mailcow/dovecot:1.140
docker.io/mailcow/dovecot:1.140
1.59: Pulling from mailcow/postfix
Digest: sha256:8516fb4eedc987df30dd41b469f8a64ebf62d66f42cb4393feb815e381bc0edb
Status: Image is up to date for mailcow/postfix:1.59
docker.io/mailcow/postfix:1.59
alpine: Pulling from library/memcached
Digest: sha256:1dff8aff13c23b641a600d19fe729b5131be37c64c3377f031ec53521fa6438d
Status: Image is up to date for memcached:alpine
docker.io/library/memcached:alpine
mainline-alpine: Pulling from library/nginx
Digest: sha256:c2ce58e024275728b00a554ac25628af25c54782865b3487b11c21cafb7fabda
Status: Image is up to date for nginx:mainline-alpine
docker.io/library/nginx:mainline-alpine
1.76: Pulling from mailcow/acme
Digest: sha256:a5f21cc4b289117a954b8526c0284f41ea234878e008173466c750e0ebbc4341
Status: Image is up to date for mailcow/acme:1.76
docker.io/mailcow/acme:1.76
1.38: Pulling from mailcow/netfilter
Digest: sha256:66b2cfd397d7300a0e804b1b2f3f5c3ea80ff26aea81c59a824f37efc97d5b96
Status: Image is up to date for mailcow/netfilter:1.38
docker.io/mailcow/netfilter:1.38
1.86: Pulling from mailcow/watchdog
Digest: sha256:b5811c47e771da5a2ff8698811720540ae4333797ac1f696c153164c5b19c85b
Status: Image is up to date for mailcow/watchdog:1.86
docker.io/mailcow/watchdog:1.86
1.37: Pulling from mailcow/dockerapi
Digest: sha256:6e1e61b2144f327b25e01c69582c4306401a0caa860a037d1f1e41640a4f3201
Status: Image is up to date for mailcow/dockerapi:1.37
docker.io/mailcow/dockerapi:1.37
1.7: Pulling from mailcow/solr
Digest: sha256:71ed77f8e12bc3845ac1cd4f0fb358fdf08014b6faea9400d9d8456d1b3c4528
Status: Image is up to date for mailcow/solr:1.7
docker.io/mailcow/solr:1.7
1.5: Pulling from mailcow/olefy
Digest: sha256:0f759e157cb7bf57ca354b0b62398bb49a7dd70b1fb57a9b05f1e74dfa6f28f6
Status: Image is up to date for mailcow/olefy:1.5
docker.io/mailcow/olefy:1.5
1.2: Pulling from mailcow/ejabberd
0a6724ff3fcd: Already exists 
0cf1049cc4cb: Already exists 
c01954596e8c: Already exists 
a9701baf3cc4: Already exists 
5854dede82ce: Already exists 
d1775a2c3304: Already exists 
8d02696596a7: Already exists 
cff9a79c9d9f: Already exists 
c2fa5eb8cc78: Already exists 
26c295baf6de: Pull complete 
ee82f8184e2c: Pull complete 
35322120a7db: Pull complete 
Digest: sha256:37a9eafa48065da27012943824b3d26a686a254b9c33e4d492884281cd0d315f
Status: Downloaded newer image for mailcow/ejabberd:1.2
docker.io/mailcow/ejabberd:1.2
Using default tag: latest
latest: Pulling from robbertkl/ipv6nat
Digest: sha256:fab186763aaf3e2c13b13fd4f33885a14ec2dc6419a08e1ed67bf22d647f3c38
Status: Image is up to date for robbertkl/ipv6nat:latest
docker.io/robbertkl/ipv6nat:latest
Stopping mailcow...
Stopping mailcowdockerized_ipv6nat-mailcow_1   ... done
Stopping mailcowdockerized_acme-mailcow_1      ... done
Stopping mailcowdockerized_rspamd-mailcow_1    ... done
Stopping mailcowdockerized_netfilter-mailcow_1 ... done
Stopping mailcowdockerized_nginx-mailcow_1     ... done
Stopping mailcowdockerized_dovecot-mailcow_1   ... done
Stopping mailcowdockerized_postfix-mailcow_1   ... done
Stopping mailcowdockerized_php-fpm-mailcow_1   ... done
Stopping mailcowdockerized_mysql-mailcow_1     ... done
Stopping mailcowdockerized_olefy-mailcow_1     ... done
Stopping mailcowdockerized_sogo-mailcow_1      ... done
Stopping mailcowdockerized_watchdog-mailcow_1  ... done
Stopping mailcowdockerized_clamd-mailcow_1     ... done
Stopping mailcowdockerized_redis-mailcow_1     ... done
Stopping mailcowdockerized_unbound-mailcow_1   ... done
Stopping mailcowdockerized_memcached-mailcow_1 ... done
Stopping mailcowdockerized_solr-mailcow_1      ... done
Stopping mailcowdockerized_dockerapi-mailcow_1 ... done
Removing mailcowdockerized_ipv6nat-mailcow_1   ... done
Removing mailcowdockerized_acme-mailcow_1      ... done
Removing mailcowdockerized_rspamd-mailcow_1    ... done
Removing mailcowdockerized_netfilter-mailcow_1 ... done
Removing mailcowdockerized_nginx-mailcow_1     ... done
Removing mailcowdockerized_dovecot-mailcow_1   ... done
Removing mailcowdockerized_postfix-mailcow_1   ... done
Removing mailcowdockerized_php-fpm-mailcow_1   ... done
Removing mailcowdockerized_mysql-mailcow_1     ... done
Removing mailcowdockerized_olefy-mailcow_1     ... done
Removing mailcowdockerized_sogo-mailcow_1      ... done
Removing mailcowdockerized_watchdog-mailcow_1  ... done
Removing mailcowdockerized_clamd-mailcow_1     ... done
Removing mailcowdockerized_redis-mailcow_1     ... done
Removing mailcowdockerized_unbound-mailcow_1   ... done
Removing mailcowdockerized_memcached-mailcow_1 ... done
Removing mailcowdockerized_solr-mailcow_1      ... done
Removing mailcowdockerized_dockerapi-mailcow_1 ... done
Removing network mailcowdockerized_mailcow-network
Checking for remaining containers...
Committing current status...
Fetching updated code from remote...
Merging local with remote code (recursive, strategy: "theirs", options: "patience"...
fatal: No current branch.

Oh no, what happened?
=> You most likely added files to your local mailcow instance that were now added to the official mailcow repository. Please move them to another location before updating mailcow.

Git show says:

# git show
commit b96f4d24744d428335647857beb6a66808521f0e (HEAD)
Author: moo <moo@cow.moo>
Date:   Fri Feb 12 11:43:03 2021 +0100

    Before update on 2021-02-12_11_41_58

diff --git a/update.sh b/update.sh
index 05e9b1a5..c8f9eb75 100755
--- a/update.sh
+++ b/update.sh
@@ -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

Do you have any suggestions on what I can do to be able to update again?

Thanks,
Michele