forked from pool/postfix
Accepting request 451785 from server:mail
some fixes for config.postfix (forwarded request 451782 from computersalat) OBS-URL: https://build.opensuse.org/request/show/451785 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postfix?expand=0&rev=137
This commit is contained in:
commit
7a93892cac
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:530e334433ad1ec45bb23b0dfbc571d00d89816a0e168d80f30dfab6c1f3eb5e
|
||||
size 26977
|
||||
oid sha256:5a3fedccd6d756b92ac8d4472ddffc014a9a3f1ec5a3bdd2b6a7fbc2f6aa3389
|
||||
size 27456
|
||||
|
@ -10,7 +10,7 @@ Index: conf/main.cf
|
||||
|
||||
# PARALLEL DELIVERY TO THE SAME DESTINATION
|
||||
#
|
||||
@@ -673,4 +674,120 @@ sample_directory =
|
||||
@@ -673,4 +674,121 @@ sample_directory =
|
||||
# readme_directory: The location of the Postfix README files.
|
||||
#
|
||||
readme_directory =
|
||||
@ -64,8 +64,8 @@ Index: conf/main.cf
|
||||
+smtp_sasl_security_options =
|
||||
+smtp_sasl_password_maps =
|
||||
+smtpd_sasl_auth_enable = no
|
||||
+#smtpd_sasl_path = private/auth
|
||||
+#smtpd_sasl_type = dovecot
|
||||
+smtpd_sasl_path = smtpd
|
||||
+smtpd_sasl_type = cyrus
|
||||
+############################################################
|
||||
+# TLS stuff
|
||||
+############################################################
|
||||
@ -80,6 +80,7 @@ Index: conf/main.cf
|
||||
+smtp_tls_CApath =
|
||||
+smtp_tls_cert_file =
|
||||
+smtp_tls_key_file =
|
||||
+#smtp_tls_policy_maps = hash:/etc/postfix/tls_policy
|
||||
+#smtp_tls_session_cache_timeout = 3600s
|
||||
+smtp_tls_session_cache_database =
|
||||
+
|
||||
|
@ -2,7 +2,7 @@ Index: conf/master.cf
|
||||
===================================================================
|
||||
--- conf/master.cf.orig
|
||||
+++ conf/master.cf
|
||||
@@ -10,6 +10,11 @@
|
||||
@@ -10,32 +10,38 @@
|
||||
# (yes) (yes) (no) (never) (100)
|
||||
# ==========================================================================
|
||||
smtp inet n - n - - smtpd
|
||||
@ -14,14 +14,53 @@ Index: conf/master.cf
|
||||
#smtp inet n - n - 1 postscreen
|
||||
#smtpd pass - - n - - smtpd
|
||||
#dnsblog unix - - n - 0 dnsblog
|
||||
@@ -28,6 +33,7 @@ smtp inet n - n
|
||||
#tlsproxy unix - - n - 0 tlsproxy
|
||||
#submission inet n - n - - smtpd
|
||||
-# -o syslog_name=postfix/submission
|
||||
-# -o smtpd_tls_security_level=encrypt
|
||||
-# -o smtpd_sasl_auth_enable=yes
|
||||
-# -o smtpd_reject_unlisted_recipient=no
|
||||
-# -o smtpd_client_restrictions=$mua_client_restrictions
|
||||
-# -o smtpd_helo_restrictions=$mua_helo_restrictions
|
||||
-# -o smtpd_sender_restrictions=$mua_sender_restrictions
|
||||
-# -o smtpd_recipient_restrictions=
|
||||
-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
|
||||
-# -o milter_macro_daemon_name=ORIGINATING
|
||||
+# -o syslog_name=postfix/submission
|
||||
+# -o smtpd_tls_security_level=encrypt
|
||||
+# -o smtpd_sasl_auth_enable=yes
|
||||
+# -o smtpd_reject_unlisted_recipient=no
|
||||
+# -o smtpd_client_restrictions=$mua_client_restrictions
|
||||
+# -o smtpd_helo_restrictions=$mua_helo_restrictions
|
||||
+# -o smtpd_sender_restrictions=$mua_sender_restrictions
|
||||
+# -o smtpd_recipient_restrictions=
|
||||
+# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
|
||||
+# -o milter_macro_daemon_name=ORIGINATING
|
||||
#smtps inet n - n - - smtpd
|
||||
# -o syslog_name=postfix/smtps
|
||||
# -o smtpd_tls_wrappermode=yes
|
||||
+# -o content_filter=smtp:[127.0.0.1]:10024
|
||||
# -o smtpd_sasl_auth_enable=yes
|
||||
# -o smtpd_reject_unlisted_recipient=no
|
||||
# -o smtpd_client_restrictions=$mua_client_restrictions
|
||||
-# -o syslog_name=postfix/smtps
|
||||
-# -o smtpd_tls_wrappermode=yes
|
||||
-# -o smtpd_sasl_auth_enable=yes
|
||||
-# -o smtpd_reject_unlisted_recipient=no
|
||||
-# -o smtpd_client_restrictions=$mua_client_restrictions
|
||||
-# -o smtpd_helo_restrictions=$mua_helo_restrictions
|
||||
-# -o smtpd_sender_restrictions=$mua_sender_restrictions
|
||||
-# -o smtpd_recipient_restrictions=
|
||||
-# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
|
||||
-# -o milter_macro_daemon_name=ORIGINATING
|
||||
+# -o syslog_name=postfix/smtps
|
||||
+# -o smtpd_tls_wrappermode=yes
|
||||
+# -o content_filter=smtp:[127.0.0.1]:10024
|
||||
+# -o smtpd_sasl_auth_enable=yes
|
||||
+# -o smtpd_reject_unlisted_recipient=no
|
||||
+# -o smtpd_client_restrictions=$mua_client_restrictions
|
||||
+# -o smtpd_helo_restrictions=$mua_helo_restrictions
|
||||
+# -o smtpd_sender_restrictions=$mua_sender_restrictions
|
||||
+# -o smtpd_recipient_restrictions=
|
||||
+# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
|
||||
+# -o milter_macro_daemon_name=ORIGINATING
|
||||
#628 inet n - n - - qmqpd
|
||||
pickup unix n - n 60 1 pickup
|
||||
cleanup unix n - n - 0 cleanup
|
||||
@@ -62,6 +68,27 @@ virtual unix - n n
|
||||
lmtp unix - - n - - lmtp
|
||||
anvil unix - - n - 1 anvil
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b9dd4272ad39b157d99653c0adbe51fb38f1fc675b48e51f9c646dbde60d3e42
|
||||
size 1966
|
||||
oid sha256:ea50be701831082af68c0351e121a9a1654b1aa50717d3bbaf2e76f228dc6caf
|
||||
size 3150
|
||||
|
@ -174,7 +174,7 @@ Index: src/virtual/mailbox.c
|
||||
/* deliver_mailbox_file - deliver to recipient mailbox */
|
||||
|
||||
static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr)
|
||||
@@ -213,62 +277,72 @@ int deliver_mailbox(LOCAL_STATE stat
|
||||
@@ -214,62 +279,72 @@ int deliver_mailbox(LOCAL_STATE stat
|
||||
* Look up the mailbox owner rights. Defer in case of trouble.
|
||||
*/
|
||||
uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user,
|
||||
|
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 21 23:27:34 UTC 2017 - chris@computersalat.de
|
||||
|
||||
- update postfix-mysql
|
||||
* update mysql_*.cf files
|
||||
* update postfix-mysql.sql (INNODB, utf8)
|
||||
- update postfix-main.cf.patch
|
||||
* uncomment smtpd_sasl_path, smtpd_sasl_type
|
||||
can be changed via POSTFIX_SMTP_AUTH_SERVICE=(cyrus,dovecot)
|
||||
* add option for smtp_tls_policy_maps (commented)
|
||||
- update postfix-master.cf.patch
|
||||
* fix indentation of submission, smtps options for correct
|
||||
enabling via config.postfix
|
||||
- update config.postfix
|
||||
* fix sync of CA certificates
|
||||
* fix master.cf generation for submission, smtps
|
||||
- rebase postfix-vda-v14-3.0.3.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 11 14:07:35 UTC 2017 - varkoly@suse.com
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user