use unix domain socket for quota-status (#4649)

jnorell · jnorell · commit 5353f1d9d58e · 2020-06-11T12:21:13.000-06:00
diff --git a/install/tpl/debian6_dovecot2.conf.master b/install/tpl/debian6_dovecot2.conf.master
@@ -87,10 +87,10 @@ protocol lmtp {
 
 service quota-status {
   executable = quota-status -p postfix
-  inet_listener {
-    # separate multiple addresses with space:
-    address = 127.0.0.1
-    port = 10060
+  unix_listener /var/spool/postfix/private/quota-status {
+    group = postfix
+    mode = 0660
+    user = postfix
   }
   client_limit = 1
 }
diff --git a/install/tpl/debian_dovecot2.conf.master b/install/tpl/debian_dovecot2.conf.master
@@ -84,10 +84,10 @@ protocol lmtp {
 
 service quota-status {
   executable = quota-status -p postfix
-  inet_listener {
-    # separate multiple addresses with space:
-    address = 127.0.0.1
-    port = 10060
+  unix_listener /var/spool/postfix/private/quota-status {
+    group = postfix
+    mode = 0660
+    user = postfix
   }
   client_limit = 1
 }
diff --git a/install/tpl/debian_postfix.conf.master b/install/tpl/debian_postfix.conf.master
@@ -15,8 +15,8 @@ broken_sasl_auth_clients = yes
 smtpd_sasl_authenticated_header = yes
 smtpd_restriction_classes = greylisting
 greylisting = check_policy_service inet:127.0.0.1:10023 
-smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination{rbl_list}, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{greylisting}, check_policy_service inet:127.0.0.1:10060
-smtpd_end_of_data_restrictions = check_policy_service inet:127.0.0.1:10060
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination{rbl_list}, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{greylisting}, check_policy_service unix:private/quota-status
+smtpd_end_of_data_restrictions = check_policy_service unix:private/quota-status
 smtpd_use_tls = yes
 smtpd_tls_security_level = may
 smtpd_tls_cert_file = {config_dir}/smtpd.cert
diff --git a/install/tpl/fedora_dovecot2.conf.master b/install/tpl/fedora_dovecot2.conf.master
@@ -82,10 +82,10 @@ mail_plugins = $mail_plugins quota
 
 service quota-status {
   executable = quota-status -p postfix
-  inet_listener {
-    # separate multiple addresses with space:
-    address = 127.0.0.1
-    port = 10060
+  unix_listener /var/spool/postfix/private/quota-status {
+    group = postfix
+    mode = 0660
+    user = postfix
   }
   client_limit = 1
 }
diff --git a/install/tpl/fedora_postfix.conf.master b/install/tpl/fedora_postfix.conf.master
@@ -11,8 +11,8 @@ broken_sasl_auth_clients = yes
 smtpd_sasl_authenticated_header = yes
 smtpd_restriction_classes = greylisting
 greylisting = check_policy_service inet:127.0.0.1:10023
-smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination{rbl_list}, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{greylisting}, check_policy_service inet:127.0.0.1:10060
-smtpd_end_of_data_restrictions = check_policy_service inet:127.0.0.1:10060
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination{rbl_list}, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{greylisting}, check_policy_service unix:private/quota-status
+smtpd_end_of_data_restrictions = check_policy_service unix:private/quota-status
 smtpd_use_tls = yes
 smtpd_tls_security_level = may
 smtpd_tls_cert_file = {config_dir}/smtpd.cert
diff --git a/install/tpl/gentoo_postfix.conf.master b/install/tpl/gentoo_postfix.conf.master
@@ -10,8 +10,8 @@ broken_sasl_auth_clients = yes
 smtpd_sasl_authenticated_header = yes
 smtpd_restriction_classes = greylisting
 greylisting = check_policy_service inet:127.0.0.1:10023
-smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination{rbl_list}, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{greylisting}, check_policy_service inet:127.0.0.1:10060
-smtpd_end_of_data_restrictions = check_policy_service inet:127.0.0.1:10060
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination{rbl_list}, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{greylisting}, check_policy_service unix:private/quota-status
+smtpd_end_of_data_restrictions = check_policy_service unix:private/quota-status
 smtpd_use_tls = yes
 smtpd_tls_security_level = may
 smtpd_tls_cert_file = {config_dir}/smtpd.cert
diff --git a/install/tpl/opensuse_dovecot2.conf.master b/install/tpl/opensuse_dovecot2.conf.master
@@ -81,10 +81,10 @@ mail_plugins = $mail_plugins quota
 
 service quota-status {
   executable = quota-status -p postfix
-  inet_listener {
-    # separate multiple addresses with space:
-    address = 127.0.0.1
-    port = 10060
+  unix_listener /var/spool/postfix/private/quota-status {
+    group = postfix
+    mode = 0660
+    user = postfix
   }
   client_limit = 1
 }
diff --git a/install/tpl/opensuse_postfix.conf.master b/install/tpl/opensuse_postfix.conf.master
@@ -13,8 +13,8 @@ broken_sasl_auth_clients = yes
 smtpd_sasl_authenticated_header = yes
 smtpd_restriction_classes = greylisting
 greylisting = check_policy_service inet:127.0.0.1:10023
-smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination{rbl_list}, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{greylisting}, check_policy_service inet:127.0.0.1:10060
-smtpd_end_of_data_restrictions = check_policy_service inet:127.0.0.1:10060
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination{rbl_list}, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{greylisting}, check_policy_service unix:private/quota-status
+smtpd_end_of_data_restrictions = check_policy_service unix:private/quota-status
 smtpd_use_tls = yes
 smtpd_tls_security_level = may
 smtpd_tls_cert_file = {config_dir}/smtpd.cert

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,10 @@ protocol lmtp {`
`87`	`87`
`88`	`88`	`service quota-status {`
`89`	`89`	`executable = quota-status -p postfix`
`90`		`- inet_listener {`
`91`		`- # separate multiple addresses with space:`
`92`		`- address = 127.0.0.1`
`93`		`- port = 10060`
	`90`	`+ unix_listener /var/spool/postfix/private/quota-status {`
	`91`	`+ group = postfix`
	`92`	`+ mode = 0660`
	`93`	`+ user = postfix`
`94`	`94`	`}`
`95`	`95`	`client_limit = 1`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,10 @@ protocol lmtp {`
`84`	`84`
`85`	`85`	`service quota-status {`
`86`	`86`	`executable = quota-status -p postfix`
`87`		`- inet_listener {`
`88`		`- # separate multiple addresses with space:`
`89`		`- address = 127.0.0.1`
`90`		`- port = 10060`
	`87`	`+ unix_listener /var/spool/postfix/private/quota-status {`
	`88`	`+ group = postfix`
	`89`	`+ mode = 0660`
	`90`	`+ user = postfix`
`91`	`91`	`}`
`92`	`92`	`client_limit = 1`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,10 @@ mail_plugins = $mail_plugins quota`
`82`	`82`
`83`	`83`	`service quota-status {`
`84`	`84`	`executable = quota-status -p postfix`
`85`		`- inet_listener {`
`86`		`- # separate multiple addresses with space:`
`87`		`- address = 127.0.0.1`
`88`		`- port = 10060`
	`85`	`+ unix_listener /var/spool/postfix/private/quota-status {`
	`86`	`+ group = postfix`
	`87`	`+ mode = 0660`
	`88`	`+ user = postfix`
`89`	`89`	`}`
`90`	`90`	`client_limit = 1`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,10 @@ mail_plugins = $mail_plugins quota`
`81`	`81`
`82`	`82`	`service quota-status {`
`83`	`83`	`executable = quota-status -p postfix`
`84`		`- inet_listener {`
`85`		`- # separate multiple addresses with space:`
`86`		`- address = 127.0.0.1`
`87`		`- port = 10060`
	`84`	`+ unix_listener /var/spool/postfix/private/quota-status {`
	`85`	`+ group = postfix`
	`86`	`+ mode = 0660`
	`87`	`+ user = postfix`
`88`	`88`	`}`
`89`	`89`	`client_limit = 1`
`90`	`90`	`}`