Browse Source

Needs lowercase master user with SHA1

andryyy 8 years ago
parent
commit
b0db732e87
2 changed files with 4 additions and 3 deletions
  1. 3 3
      data/Dockerfiles/dovecot/docker-entrypoint.sh
  2. 1 0
      data/conf/dovecot/dovecot.conf

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

@@ -14,9 +14,9 @@ chown -R vmail:vmail /var/vmail/sieve
 if [[ $(stat -c %U /var/vmail/) != "vmail" ]] ; then chown -R vmail:vmail /var/vmail ; fi
 
 # Create random master for SOGo sieve features
-RAND_USER=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)
-RAND_PASS=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 24 | head -n 1)
-echo ${RAND_USER}:$(doveadm pw -s SSHA256 -p ${RAND_PASS}) > /etc/dovecot/dovecot-master.passwd
+RAND_USER=$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 16 | head -n 1)
+RAND_PASS=$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 24 | head -n 1)
+echo ${RAND_USER}:$(doveadm pw -s SHA1 -p ${RAND_PASS}) > /etc/dovecot/dovecot-master.passwd
 echo ${RAND_USER}:${RAND_PASS} > /etc/sogo/sieve.creds
 
 exec "$@"

+ 1 - 0
data/conf/dovecot/dovecot.conf

@@ -18,6 +18,7 @@ ssl_cipher_list = EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECD
 ssl_dh_parameters_length = 2048
 log_timestamp = "%Y-%m-%d %H:%M:%S "
 recipient_delimiter = +
+auth_master_user_separator = *
 passdb {
   driver = passwd-file
   args = /etc/dovecot/dovecot-master.passwd