pool/postfix
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 901774 from home:computersalat:devel:mail

Browse Source 
rework config.postfix for BackupMX and relay_recipients

OBS-URL: https://build.opensuse.org/request/show/901774
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=416
This commit is contained in:
Christian Wittmer 2021-06-26 12:18:59 +00:00 committed by Git OBS Bridge
parent 6ce4797c32
commit db7610879d
6 changed files with 87 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
postfix-SUSE.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:60e45b1fe04caeaf0b5c0e70acc9cc6d1b96a30806b6b1ffe94e04478e47f2b5 oid sha256:ee48dacaa660042da238ec994b08a55e235f152621a95adbf2e1dbcf29c893f0
size 23699 size 23890

3
postfix-main.cf.patch
View File

@ -50,7 +50,7 @@ Index: conf/main.cf
# PARALLEL DELIVERY TO THE SAME DESTINATION # PARALLEL DELIVERY TO THE SAME DESTINATION
# #
@@ -673,4 +674,140 @@ sample_directory = @@ -673,4 +674,141 @@ sample_directory =
# readme_directory: The location of the Postfix README files. # readme_directory: The location of the Postfix README files.
# #
readme_directory = readme_directory =
@ -154,6 +154,7 @@ Index: conf/main.cf
+# Start MySQL from postfixwiki.org +# Start MySQL from postfixwiki.org
+############################################################ +############################################################
+relay_domains = $mydestination, lmdb:/etc/postfix/relay +relay_domains = $mydestination, lmdb:/etc/postfix/relay
+relay_recipient_maps = lmdb:/etc/postfix/relay_recipients
+#virtual_alias_domains = +#virtual_alias_domains =
+#virtual_alias_maps = lmdb:/etc/postfix/virtual +#virtual_alias_maps = lmdb:/etc/postfix/virtual
+#virtual_uid_maps = static:303 +#virtual_uid_maps = static:303

66
postfix-master.cf.patch
View File

@ -14,15 +14,61 @@ Index: conf/master.cf
#smtp inet n - n - 1 postscreen #smtp inet n - n - 1 postscreen
#smtpd pass - - n - - smtpd #smtpd pass - - n - - smtpd
#dnsblog unix - - n - 0 dnsblog #dnsblog unix - - n - 0 dnsblog
@@ -19,6 +24,7 @@ smtp inet n - n @@ -17,30 +22,32 @@ smtp inet n - n
# Choose one: enable submission for loopback clients only, or for any client.
#127.0.0.1:submission inet n - n - - smtpd
#submission inet n - n - - smtpd #submission inet n - n - - smtpd
# -o syslog_name=postfix/submission -# -o syslog_name=postfix/submission
# -o smtpd_tls_security_level=encrypt -# -o smtpd_tls_security_level=encrypt
+# -o content_filter=smtp:[127.0.0.1]:10024 -# -o smtpd_sasl_auth_enable=yes
# -o smtpd_sasl_auth_enable=yes -# -o smtpd_tls_auth_only=yes
# -o smtpd_tls_auth_only=yes -# -o smtpd_reject_unlisted_recipient=no
# -o smtpd_reject_unlisted_recipient=no -# -o smtpd_client_restrictions=$mua_client_restrictions
@@ -69,6 +75,26 @@ lmtp unix - - n -# -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 content_filter=smtp:[127.0.0.1]:10024
+# -o smtpd_sasl_auth_enable=yes
+# -o smtpd_tls_auth_only=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
# Choose one: enable smtps for loopback clients only, or for any client.
#127.0.0.1:smtps inet n - n - - smtpd
#smtps inet n - n - - smtpd
-# -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
@@ -69,6 +76,26 @@ lmtp unix - - n
anvil unix - - n - 1 anvil anvil unix - - n - 1 anvil
scache unix - - n - 1 scache scache unix - - n - 1 scache
postlog unix-dgram n - n - 1 postlogd postlog unix-dgram n - n - 1 postlogd
@ -49,7 +95,7 @@ Index: conf/master.cf
# #
# ==================================================================== # ====================================================================
# Interfaces to non-Postfix software. Be sure to examine the manual # Interfaces to non-Postfix software. Be sure to examine the manual
@@ -102,7 +128,7 @@ postlog unix-dgram n - n @@ -102,7 +129,7 @@ postlog unix-dgram n - n
# Also specify in main.cf: cyrus_destination_recipient_limit=1 # Also specify in main.cf: cyrus_destination_recipient_limit=1
# #
#cyrus unix - n n - - pipe #cyrus unix - n n - - pipe
@ -58,7 +104,7 @@ Index: conf/master.cf
# #
# ==================================================================== # ====================================================================
# #
@@ -135,3 +161,10 @@ postlog unix-dgram n - n @@ -135,3 +162,10 @@ postlog unix-dgram n - n
#mailman unix - n n - - pipe #mailman unix - n n - - pipe
# flags=FRX user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py # flags=FRX user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
# ${nexthop} ${user} # ${nexthop} ${user}

BIN
postfix-mysql.tar.bz2 (Stored with Git LFS)
View File

Binary file not shown.

23
postfix.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Jun 23 22:28:52 UTC 2021 - Christian Wittmer <chris@computersalat.de>
- postfix-mysql
* add mysql_relay_recipient_maps.cf
- postfix-SUSE
* rework sysconfig.postfix, add
- POSTFIX_RELAY_RECIPIENTS
- POSTFIX_BACKUPMX
* add relay_recipients
* rework config.postfix for main.cf
- is_backupmx
- relay_recipient_maps
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 18 17:11:05 UTC 2021 - Callum Farmer <gmbr3@opensuse.org> Fri Jun 18 17:11:05 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
@ -16,6 +30,15 @@ Mon Jun 14 15:46:54 UTC 2021 - Michael Ströder <michael@stroeder.com>
* Typo (introduced: Postfix 3.4): silent_discard should be * Typo (introduced: Postfix 3.4): silent_discard should be
silent-discard in BDAT_README. silent-discard in BDAT_README.
-------------------------------------------------------------------
Sun Jun 6 12:51:35 UTC 2021 - Christian Wittmer <chris@computersalat.de>
- fix postfix-master.cf.patch
* set correct indentation (again) for options of
- submission (needs 3 spaces)
- smtps (needs 4 spaces)
to make config.postfix work nicely again
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 2 00:26:36 UTC 2021 - Marcus Rueckert <mrueckert@suse.de> Wed Jun 2 00:26:36 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>

2
postfix.spec
View File

@ -299,6 +299,7 @@ install -m 644 %{name}-SUSE/permissions %{buildroot}%{_sysconfdir}/permissions.d
install -m 644 %{name}-SUSE/sender_canonical %{buildroot}%{_sysconfdir}/%{name}/sender_canonical install -m 644 %{name}-SUSE/sender_canonical %{buildroot}%{_sysconfdir}/%{name}/sender_canonical
install -m 644 %{name}-SUSE/relay %{buildroot}%{_sysconfdir}/%{name}/relay install -m 644 %{name}-SUSE/relay %{buildroot}%{_sysconfdir}/%{name}/relay
install -m 644 %{name}-SUSE/relay_ccerts %{buildroot}%{_sysconfdir}/%{name}/relay_ccerts install -m 644 %{name}-SUSE/relay_ccerts %{buildroot}%{_sysconfdir}/%{name}/relay_ccerts
install -m 644 %{name}-SUSE/relay_recipients %{buildroot}%{_sysconfdir}/%{name}/relay_recipients
install -m 600 %{name}-SUSE/sasl_passwd %{buildroot}%{_sysconfdir}/%{name}/sasl_passwd install -m 600 %{name}-SUSE/sasl_passwd %{buildroot}%{_sysconfdir}/%{name}/sasl_passwd
mkdir -p %{buildroot}%{_sysconfdir}/sasl2 mkdir -p %{buildroot}%{_sysconfdir}/sasl2
install -m 600 %{name}-SUSE/smtpd.conf %{buildroot}%{_sysconfdir}/sasl2/smtpd.conf install -m 600 %{name}-SUSE/smtpd.conf %{buildroot}%{_sysconfdir}/sasl2/smtpd.conf
@ -490,6 +491,7 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/master.cf %config(noreplace) %{_sysconfdir}/%{name}/master.cf
%config(noreplace) %{_sysconfdir}/%{name}/relay %config(noreplace) %{_sysconfdir}/%{name}/relay
%config(noreplace) %{_sysconfdir}/%{name}/relay_ccerts %config(noreplace) %{_sysconfdir}/%{name}/relay_ccerts
%config(noreplace) %{_sysconfdir}/%{name}/relay_recipients
%config(noreplace) %{_sysconfdir}/%{name}/sasl_passwd %config(noreplace) %{_sysconfdir}/%{name}/sasl_passwd
%config(noreplace) %{_sysconfdir}/%{name}/sender_canonical %config(noreplace) %{_sysconfdir}/%{name}/sender_canonical
%config(noreplace) %{_sysconfdir}/%{name}/virtual %config(noreplace) %{_sysconfdir}/%{name}/virtual