github/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-02-13 21:00:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

update: remove obsoleted SOGO_URL_ENCRYPTION_KEY from mailcow configs (moved to sogo.conf)

Browse Source
This commit is contained in:
DerLinkman
2025-12-16 15:51:53 +01:00
parent 038b2efb75
commit d3ddb5528f
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
_modules/scripts/migrate_options.sh
View File

@@ -14,6 +14,7 @@ migrate_config_options() {
FLATCURVE_EXPERIMENTAL FLATCURVE_EXPERIMENTAL
DISABLE_IPv6 DISABLE_IPv6
ACME_CONTACT ACME_CONTACT
SOGO_URL_ENCRYPTION_KEY
) )
for key in "${KEYS[@]}"; do for key in "${KEYS[@]}"; do
@@ -62,6 +63,12 @@ migrate_config_options() {
sed -i '/^ACME_CONTACT=.*/d' mailcow.conf sed -i '/^ACME_CONTACT=.*/d' mailcow.conf
sed -i '/^#ACME_CONTACT=.*/d' mailcow.conf sed -i '/^#ACME_CONTACT=.*/d' mailcow.conf
;; ;;
SOGO_URL_ENCRYPTION_KEY)
echo "Removing ${key} in mailcow.conf (moved to sogo.conf)"
sed -i '/^# SOGo URL encryption key/d' mailcow.conf
sed -i '/^# This key is used to encrypt email addresses within SOGo URLs/d' mailcow.conf
sed -i '/^SOGO_URL_ENCRYPTION_KEY=.*/d' mailcow.conf
;;
esac esac
fi fi
done done

6
_modules/scripts/new_options.sh
View File

@@ -43,7 +43,6 @@ adapt_new_options() {
"ALLOW_ADMIN_EMAIL_LOGIN" "ALLOW_ADMIN_EMAIL_LOGIN"
"SKIP_HTTP_VERIFICATION" "SKIP_HTTP_VERIFICATION"
"SOGO_EXPIRE_SESSION" "SOGO_EXPIRE_SESSION"
"SOGO_URL_ENCRYPTION_KEY"
"REDIS_PORT" "REDIS_PORT"
"REDISPASS" "REDISPASS"
"DOVECOT_MASTER_USER" "DOVECOT_MASTER_USER"
@@ -287,11 +286,6 @@ adapt_new_options() {
REDISPASS) REDISPASS)
echo "REDISPASS=$(LC_ALL=C </dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c 28)" >> mailcow.conf echo "REDISPASS=$(LC_ALL=C </dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c 28)" >> mailcow.conf
;; ;;
SOGO_URL_ENCRYPTION_KEY)
echo '# SOGo URL encryption key (exactly 16 characters, limited to A–Z, a–z, 0–9)' >> mailcow.conf
echo '# This key is used to encrypt email addresses within SOGo URLs' >> mailcow.conf
echo "SOGO_URL_ENCRYPTION_KEY=$(LC_ALL=C </dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c 16)" >> mailcow.conf
;;
*) *)
echo "${option}=" >> mailcow.conf echo "${option}=" >> mailcow.conf
;; ;;

1
docker-compose.yml
View File

@@ -213,7 +213,6 @@ services:
- ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n} - ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n}
- IPV4_NETWORK=${IPV4_NETWORK:-172.22.1} - IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
- SOGO_EXPIRE_SESSION=${SOGO_EXPIRE_SESSION:-480} - SOGO_EXPIRE_SESSION=${SOGO_EXPIRE_SESSION:-480}
- SOGO_URL_ENCRYPTION_KEY=${SOGO_URL_ENCRYPTION_KEY:-SOGoSuperSecret0}
- SKIP_SOGO=${SKIP_SOGO:-n} - SKIP_SOGO=${SKIP_SOGO:-n}
- MASTER=${MASTER:-y} - MASTER=${MASTER:-y}
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-} - REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}

4
generate_config.sh
View File

@@ -405,10 +405,6 @@ MAILDIR_SUB=Maildir
# SOGo session timeout in minutes # SOGo session timeout in minutes
SOGO_EXPIRE_SESSION=480 SOGO_EXPIRE_SESSION=480
# SOGo URL encryption key (exactly 16 characters, limited to A–Z, a–z, 0–9)
# This key is used to encrypt email addresses within SOGo URLs
SOGO_URL_ENCRYPTION_KEY=$(LC_ALL=C </dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c 16)
# DOVECOT_MASTER_USER and DOVECOT_MASTER_PASS must both be provided. No special chars. # DOVECOT_MASTER_USER and DOVECOT_MASTER_PASS must both be provided. No special chars.
# Empty by default to auto-generate master user and password on start. # Empty by default to auto-generate master user and password on start.
# User expands to DOVECOT_MASTER_USER@mailcow.local # User expands to DOVECOT_MASTER_USER@mailcow.local