Browse Source

[Dovecot] Fix GUID

andryyy 6 years ago
parent
commit
3488cb2171
2 changed files with 2 additions and 2 deletions
  1. 1 1
      data/Dockerfiles/dovecot/docker-entrypoint.sh
  2. 1 1
      docker-compose.yml

+ 1 - 1
data/Dockerfiles/dovecot/docker-entrypoint.sh

@@ -245,7 +245,7 @@ echo "$(envsubst < /usr/local/bin/maildir_gc.sh)" > /usr/local/bin/maildir_gc.sh
 
 PUBKEY_MCRYPT=$(doveconf -P | grep -i mail_crypt_global_public_key | cut -d '<' -f2)
 if [ -f ${PUBKEY_MCRYPT} ]; then
-  GUID=$(cat <(echo ${MAILCOW_HOSTNAME}) /mail_crypt/ecpubkey.pem | grep -v 'PUBLIC KEY' | base64 -d | sha256sum | cut -d ' ' -f1 | tr -cd "[a-fA-F0-9.:/] ")
+  GUID=$(cat <(echo ${MAILCOW_HOSTNAME}) /mail_crypt/ecpubkey.pem | sha256sum | cut -d ' ' -f1 | tr -cd "[a-fA-F0-9.:/] ")
   if [ ${#GUID} -eq 64 ]; then
     mysql --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} << EOF
 REPLACE INTO versions (application, version) VALUES ("GUID", "${GUID}");

+ 1 - 1
docker-compose.yml

@@ -174,7 +174,7 @@ services:
             - sogo
 
     dovecot-mailcow:
-      image: mailcow/dovecot:1.84
+      image: mailcow/dovecot:1.85
       build: ./data/Dockerfiles/dovecot
       cap_add:
         - NET_BIND_SERVICE