public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

[Postfix] Implement disallowed logins

3459c130

andryyy <[email protected]> 6 years ago

data/Dockerfiles/postfix/postfix.sh | 6 +++---
 docker-compose.yml                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Diff

diff --git a/data/Dockerfiles/postfix/postfix.sh b/data/Dockerfiles/postfix/postfix.sh
index d89d1150..99be3666 100755
--- a/data/Dockerfiles/postfix/postfix.sh
+++ b/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
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 144a4014..696fff5e 100644
--- a/docker-compose.yml
+++ b/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: