From 6e9572a5e0b33952de3c5b873b980ae465348e73 Mon Sep 17 00:00:00 2001
From: Gorden Mende <gorden.mende@solusar.de>
Date: Thu, 22 Dec 2022 11:06:25 +0100
Subject: [PATCH] changes in mail system

---
 .etckeeper                                |   2 +-
 aliases.db                                | Bin 12288 -> 12288 bytes
 dovecot/dovecot-mysql.conf                |   6 ++++--
 postfix/main.cf                           |   2 +-
 postfix/mysql_virtual_recipient_access.cf |   3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.etckeeper b/.etckeeper
index 34cfd52a..791dcaa8 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -573,7 +573,7 @@ maybe chgrp 'dovecot' 'dovecot/dovecot-dict-auth.conf.ext'
 maybe chmod 0640 'dovecot/dovecot-dict-auth.conf.ext'
 maybe chgrp 'dovecot' 'dovecot/dovecot-dict-sql.conf.ext'
 maybe chmod 0640 'dovecot/dovecot-dict-sql.conf.ext'
-maybe chmod 0644 'dovecot/dovecot-mysql.conf'
+maybe chmod 0440 'dovecot/dovecot-mysql.conf'
 maybe chgrp 'dovecot' 'dovecot/dovecot-sql.conf.ext'
 maybe chmod 0640 'dovecot/dovecot-sql.conf.ext'
 maybe chmod 0644 'dovecot/dovecot.conf'
diff --git a/aliases.db b/aliases.db
index ce5ef307fc74aa31dedb1d3953da3b641a334635..8eb8e1b7c9bd05d4886b7d1b3bc55d99b3ccf830 100644
GIT binary patch
delta 52
ycmZojXh@h~!(OS|WSUyVGWkEh=*Eanc@A?!a|0uDOOwej<%5wWH%BO};0FNPN)fdH

delta 52
ycmZojXh@h~!~S;p&gD6i87Kee7u^`qDbHbQZfIa(W^Oq7rF<~5<mL#475o4_jTIXJ

diff --git a/dovecot/dovecot-mysql.conf b/dovecot/dovecot-mysql.conf
index 9643fddc..8590dcb8 100644
--- a/dovecot/dovecot-mysql.conf
+++ b/dovecot/dovecot-mysql.conf
@@ -1,6 +1,8 @@
 driver = mysql
 connect = host=localhost dbname=postfixdb user=postfix password=e9EEBSJCxPHw
 default_pass_scheme = MD5-CRYPT
-password_query = SELECT password FROM mailbox WHERE username = '%u'
+#password_query = SELECT username AS user, domain, password FROM mailbox WHERE username = '%u' AND domain = '%d' and active = true;
+password_query = SELECT password FROM mailbox WHERE username = '%u' and active = true;
 user_query = SELECT CONCAT('maildir:/var/opt/vmail/',maildir) AS mail, 5000 AS uid, 5000 AS gid FROM mailbox INNER JOIN domain WHERE username = '%u' AND mailbox.active = '1' AND domain.active = '1'
-
+#user_query = SELECT concat('*:storage=', quota, 'M') AS quota_rule FROM mailbox WHERE username = '%n' AND domain = '%d' AND sendonly = false;
+iterate_query = SELECT username, domain FROM mailbox where sendonly = false;
diff --git a/postfix/main.cf b/postfix/main.cf
index 69b16662..f4e54b85 100644
--- a/postfix/main.cf
+++ b/postfix/main.cf
@@ -126,7 +126,7 @@ smtpd_relay_restrictions =      reject_non_fqdn_recipient
 
 ### Bedingungen, damit Postfix ankommende E-Mails als Empfängerserver entgegennimmt (zusätzlich zu relay-Bedingungen)
 ### check_recipient_access prüft, ob ein account sendonly ist
-#smtpd_recipient_restrictions = check_recipient_access mysql:/etc/postfix/mysql_virtual_recipient_access.cf
+smtpd_recipient_restrictions = check_recipient_access mysql:/etc/postfix/mysql_virtual_recipient_access.cf
 
 
 ### Bedingungen, die SMTP-Clients erfüllen müssen (sendende Server)
diff --git a/postfix/mysql_virtual_recipient_access.cf b/postfix/mysql_virtual_recipient_access.cf
index a36de939..ed294362 100644
--- a/postfix/mysql_virtual_recipient_access.cf
+++ b/postfix/mysql_virtual_recipient_access.cf
@@ -2,4 +2,5 @@ user = postfix
 password = e9EEBSJCxPHw
 hosts = localhost
 dbname = postfixdb
-query = select if(sendonly = true, 'REJECT', 'OK') AS access from accounts where username = '%u' and domain = '%d' and enabled = true LIMIT 1;
+#query = select if(sendonly = true, 'REJECT', 'OK') AS access from mailbox where username = '%u' and domain = '%d' and enabled = true LIMIT 1;
+query = select if(sendonly = true, 'REJECT', 'OK') AS access from mailbox where username = '%u' and active = true LIMIT 1;