Automatic PR to nightly from 2023-08-02T11:07:42Z

[milkmaker]

📝 Brief description

Merge pull request #5090 from mailcow/staging
Merge pull request #5115 from mailcow/staging
Merge pull request #5132 from mailcow/staging
Merge pull request #5144 from mailcow/staging
Merge pull request #5148 from mailcow/staging
Merge pull request #5151 from mailcow/staging
Merge pull request #5154 from mailcow/staging
Merge pull request #5165 from mailcow/staging
Merge pull request #5229 from mailcow/staging
Merge pull request #5230 from mailcow/staging
Merge pull request #5249 from mailcow/staging
Merge pull request #5258 from mailcow/staging
Merge pull request #5265 from mailcow/staging
Merge pull request #5268 from mailcow/staging
Merge pull request #5295 from mailcow/feat/spamhaus-dqs-asn
Merge pull request #5282 from mailcow/staging
Merge pull request #5336 from mailcow/staging
Merge pull request #5343 from mailcow/staging
Merge pull request #5350 from mailcow/staging
Fix main.cf merging order
Fix for fix
Add postscreen_dnsbl_reply_map to avoid disclosure of DQS key with Spamhaus setup
Merge pull request #5356 from sriccio/fix-postfix-merge-order
[Postfix] rework dns_blocklists.cf generation
[Postfix] only apply DNSBL if dns_blocklists.cf is not empty
Merge pull request #5359 from mailcow/fix/gen-dnsbl
[Postfix] remove spamhaus dbl and zrd from postscreen_dnsbl_sites
Merge branch 'staging' into staging
Merge pull request #5357 from DocFraggle/staging
[Postfix] remove dnsbl_reply.map if not required

💻 Commits

• b050cb9 - FreddleSpl0it - 2023-08-03 09:00:08
  | [Postfix] remove dnsbl_reply.map if not required
  |

• e176724 - Patrick Schult - 2023-08-03 08:15:16
  | Merge pull request Add postscreen_dnsbl_reply_map to avoid disclosure of DQS key #5357 from DocFraggle/staging
  | | Add postscreen_dnsbl_reply_map to avoid disclosure of DQS key
  | * 8f9ed9e - DocFraggle - 2023-08-02 20:20:18
  | | Merge branch 'staging' into staging
  | |/
  |/|
  | |

• | 003eecf - FreddleSpl0it - 2023-08-02 17:08:55
  | | [Postfix] remove spamhaus dbl and zrd from postscreen_dnsbl_sites
  | |

• | 180b9fc - Patrick Schult - 2023-08-02 16:51:56
  | Merge pull request [Postfix] rework dns_blocklists.cf generation #5359 from mailcow/fix/gen-dnsbl
  | | | [Postfix] rework dns_blocklists.cf generation
  | * | 5d3491c - FreddleSpl0it - 2023-08-02 16:48:22
  | | | [Postfix] only apply DNSBL if dns_blocklists.cf is not empty
  | | |
  | * | c45684b - FreddleSpl0it - 2023-08-02 16:36:59
  |/ / [Postfix] rework dns_blocklists.cf generation
  | |

• | 5c886d2 - Patrick Schult - 2023-08-02 15:17:20
  | | Merge pull request Fix main.cf merging order #5356 from sriccio/fix-postfix-merge-order
  | | Fix main.cf merging order

• | 7cda9f0 - Sébastien RICCIO - 2023-08-01 13:59:23
  | | Fix for fix
  | | I did not paid attention to the "User overrides" sed/q

• | 5e7583c - Sébastien RICCIO - 2023-08-01 10:49:26
  | | Fix main.cf merging order
  | | Now the dnsbl files are merged before extra.cf

• | a1fb962 - Niklas Meyer - 2023-07-31 14:52:24
  / Merge pull request 2023-07a #5350 from mailcow/staging
  | 2023-07a

• 9f39af4 - Christian Hailer - 2023-08-01 16:12:44
  Add postscreen_dnsbl_reply_map to avoid disclosure of DQS key with Spamhaus setup

• 66c68bb - Niklas Meyer - 2023-07-31 14:48:10
  | Merge pull request Automatic PR to nightly from 2023-07-30T15:14:57Z #5343 from mailcow/staging
  | Automatic PR to nightly from 2023-07-30T15:14:57Z

• 4540392 - Niklas Meyer - 2023-07-28 20:43:53
  | Merge pull request Automatic PR to nightly from 2023-07-28T16:11:41Z #5336 from mailcow/staging
  | Automatic PR to nightly from 2023-07-28T16:11:41Z

• c200644 - Niklas Meyer - 2023-07-28 12:22:01
  | Merge pull request Automatic PR to nightly from 2023-06-12T14:11:27Z #5282 from mailcow/staging
  | Automatic PR to nightly from 2023-06-12T14:11:27Z

• 2d145ba - Niklas Meyer - 2023-07-13 16:52:09
  | Merge pull request Spamhaus DNSBL AS Detection #5295 from mailcow/feat/spamhaus-dqs-asn
  | Spamhaus DNSBL AS Detection

• 47f122a - Niklas Meyer - 2023-06-01 15:27:55
  | Merge pull request Automatic PR to nightly from 2023-06-01T13:07:21Z #5268 from mailcow/staging
  |

• ddcc2c9 - Niklas Meyer - 2023-05-30 16:55:13
  | Merge pull request Automatic PR to nightly from 2023-05-30T13:04:22Z #5265 from mailcow/staging
  | Automatic PR to nightly from 2023-05-30T13:04:22Z

• 288e5d1 - Niklas Meyer - 2023-05-30 16:22:43
  | Merge pull request Automatic PR to nightly from 2023-05-28T13:15:57Z #5258 from mailcow/staging
  | Automatic PR to nightly from 2023-05-28T13:15:57Z

• 47cfec4 - Niklas Meyer - 2023-05-25 15:41:29
  | Merge pull request Automatic PR to nightly from 2023-05-25T12:16:31Z #5249 from mailcow/staging
  | Automatic PR to nightly from 2023-05-25T12:16:31Z

• bb8255c - Niklas Meyer - 2023-05-24 11:04:10
  | Merge pull request Automatic PR to nightly from 2023-05-08T06:04:57Z #5230 from mailcow/staging
  | Automatic PR to nightly from 2023-05-08T06:04:57Z

• 4d824d4 - Niklas Meyer - 2023-05-08 16:26:55
  | Merge pull request Automatic PR to nightly from 2023-05-08T06:04:57Z #5229 from mailcow/staging
  | Automatic PR to nightly from 2023-05-08T06:04:57Z

• 73e9dd0 - Niklas Meyer - 2023-05-02 18:44:54
  | Merge pull request Automatic PR to nightly from 2023-04-03T17:18:39Z #5165 from mailcow/staging
  | Automatic PR to nightly from 2023-04-03T17:18:39Z

• 2366ff5 - Niklas Meyer - 2023-04-03 14:24:11
  | Merge pull request Automatic PR to nightly from 2023-03-28T22:12:48Z #5154 from mailcow/staging
  | Automatic PR to nightly from 2023-03-28T22:12:48Z

• d1c455a - Niklas Meyer - 2023-03-28 12:27:32
  | Merge pull request Automatic PR to nightly from 2023-03-28T08:11:01Z #5151 from mailcow/staging
  | Automatic PR to nightly from 2023-03-28T08:11:01Z

• 0f45234 - Niklas Meyer - 2023-03-27 16:40:44
  | Merge pull request Automatic PR to nightly from 2023-03-27T06:34:45Z #5148 from mailcow/staging
  | Automatic PR to nightly from 2023-03-27T06:34:45Z

• 43eb5d8 - Niklas Meyer - 2023-03-23 20:02:45
  | Merge pull request Automatic PR to nightly from 2023-03-22T12:36:38Z #5144 from mailcow/staging
  | Automatic PR to nightly from 2023-03-22T12:36:38Z

• 4e96000 - Niklas Meyer - 2023-03-20 12:06:29
  | Merge pull request Automatic PR to nightly from 2023-03-17T15:29:02Z #5132 from mailcow/staging
  | Automatic PR to nightly from 2023-03-17T15:29:02Z

• 380853c - Niklas Meyer - 2023-03-09 15:13:16
  | Merge pull request Automatic PR to nightly from 2023-03-06T13:28:02Z #5115 from mailcow/staging
  | Automatic PR to nightly from 2023-03-06T13:28:02Z

• 2db82c1 - Niklas Meyer - 2023-03-03 16:09:28
  Merge pull request Automatic PR to nightly from 2023-02-23T19:21:31Z #5090 from mailcow/staging
  Automatic PR to nightly from 2023-02-23T19:21:31Z

📁 Modified files

.gitignore | 1 +
data/Dockerfiles/postfix/postfix.sh | 107 ++++++++++++++++++++---------
data/conf/postfix/dns_blocklists.cf (gone) | 25 -------
data/conf/postfix/main.cf | 2 +-
docker-compose.yml | 2 +-
5 files changed, 78 insertions(+), 59 deletions(-)

[milkmaker]

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

[milkmaker]

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

[milkmaker]

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

[milkmaker]

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

[milkmaker]

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging: