Преглед изворни кода

[Postfix] Implement disallowed logins

andryyy пре 5 година
родитељ
комит
3459c13022
2 измењених фајлова са 4 додато и 4 уклоњено
  1. 3 3
      data/Dockerfiles/postfix/postfix.sh
  2. 1 1
      docker-compose.yml

+ 3 - 3
data/Dockerfiles/postfix/postfix.sh

@@ -194,7 +194,7 @@ dbname = ${DBNAME}
 query = SELECT username FROM mailbox, alias_domain
   WHERE alias_domain.alias_domain = '%d'
     AND mailbox.username = CONCAT('%u', '@', alias_domain.target_domain)
-    AND mailbox.active = '1'
+    AND (mailbox.active = '1' OR mailbox.active = '2')
     AND alias_domain.active='1'
 EOF
 
@@ -264,7 +264,7 @@ user = ${DBUSER}
 password = ${DBPASS}
 hosts = unix:/var/run/mysqld/mysqld.sock
 dbname = ${DBNAME}
-query = SELECT CONCAT(JSON_UNQUOTE(JSON_EXTRACT(attributes, '$.mailbox_format')), mailbox_path_prefix, '%d/%u/') FROM mailbox WHERE username='%s' AND active = '1'
+query = SELECT CONCAT(JSON_UNQUOTE(JSON_EXTRACT(attributes, '$.mailbox_format')), mailbox_path_prefix, '%d/%u/') FROM mailbox WHERE username='%s' AND (active = '1' OR active = '2')
 EOF
 
 cat <<EOF > /opt/postfix/conf/sql/mysql_virtual_relay_domain_maps.cf
@@ -314,7 +314,7 @@ query = SELECT goto FROM alias
   SELECT username FROM mailbox, alias_domain
     WHERE alias_domain.alias_domain = '%d'
       AND mailbox.username = CONCAT('%u','@',alias_domain.target_domain)
-      AND mailbox.active ='1'
+      AND (mailbox.active = '1' OR mailbox.active ='2')
       AND alias_domain.active='1'
 EOF
 

+ 1 - 1
docker-compose.yml

@@ -249,7 +249,7 @@ services:
             - dovecot
 
     postfix-mailcow:
-      image: mailcow/postfix:1.48
+      image: mailcow/postfix:1.49
       depends_on:
         - mysql-mailcow
       volumes: