From 37c90087bfdd2b783d3f701c0d0b7d561279f5f3 Mon Sep 17 00:00:00 2001
From: Rottler Tamas <tom@bitfit.hu>
Date: Thu, 8 Jan 2026 20:30:27 +0100
Subject: [PATCH] ubuntu 24.04

---
 files/postfix_master.cf.patch.ubuntu24.04 | 74 +++++++++++++++++++++++
 tasks/main.yml                            | 12 +++-
 2 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 files/postfix_master.cf.patch.ubuntu24.04

diff --git a/files/postfix_master.cf.patch.ubuntu24.04 b/files/postfix_master.cf.patch.ubuntu24.04
new file mode 100644
index 0000000..8037bc6
--- /dev/null
+++ b/files/postfix_master.cf.patch.ubuntu24.04
@@ -0,0 +1,74 @@
+--- master.cf.orig      2026-01-08 00:00:27.907947501 +0000
++++ master.cf   2026-01-08 00:12:21.112823333 +0000
+@@ -9,7 +9,8 @@
+ # service type  private unpriv  chroot  wakeup  maxproc command + args
+ #               (yes)   (yes)   (no)    (never) (100)
+ # ==========================================================================
+-smtp      inet  n       -       y       -       -       smtpd
++#smtp      inet  n       -       y       -       -       smtpd
++localhost:smtp inet n   -       y       -       -       smtpd
+ #smtp      inet  n       -       y       -       1       postscreen
+ #smtpd     pass  -       -       y       -       -       smtpd
+ #dnsblog   unix  -       -       y       -       0       dnsblog
+@@ -80,61 +81,6 @@
+ scache    unix  -       -       y       -       1       scache
+ postlog   unix-dgram n  -       n       -       1       postlogd
+ #
+-# ====================================================================
+-# Interfaces to non-Postfix software. Be sure to examine the manual
+-# pages of the non-Postfix software to find out what options it wants.
+-#
+-# Many of the following services use the Postfix pipe(8) delivery
+-# agent.  See the pipe(8) man page for information about ${recipient}
+-# and other message envelope options.
+-# ====================================================================
+-#
+-# maildrop. See the Postfix MAILDROP_README file for details.
+-# Also specify in main.cf: maildrop_destination_recipient_limit=1
+-#
+ #maildrop  unix  -       n       n       -       -       pipe
+ #  flags=DRXhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
+ #
+-# ====================================================================
+-#
+-# Recent Cyrus versions can use the existing "lmtp" master.cf entry.
+-#
+-# Specify in cyrus.conf:
+-#   lmtp    cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4
+-#
+-# Specify in main.cf one or more of the following:
+-#  mailbox_transport = lmtp:inet:localhost
+-#  virtual_transport = lmtp:inet:localhost
+-#
+-# ====================================================================
+-#
+-# Cyrus 2.1.5 (Amos Gouaux)
+-# Also specify in main.cf: cyrus_destination_recipient_limit=1
+-#
+-#cyrus     unix  -       n       n       -       -       pipe
+-#  flags=DRX user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
+-#
+-# ====================================================================
+-#
+-# Old example of delivery via Cyrus.
+-#
+-#old-cyrus unix  -       n       n       -       -       pipe
+-#  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
+-#
+-# ====================================================================
+-#
+-# See the Postfix UUCP_README file for configuration details.
+-#
+-uucp      unix  -       n       n       -       -       pipe
+-  flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
+-#
+-# Other external delivery methods.
+-#
+-#ifmail    unix  -       n       n       -       -       pipe
+-#  flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
+-#bsmtp     unix  -       n       n       -       -       pipe
+-#  flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -t$nexthop -f$sender $recipient
+-#scalemail-backend unix -       n       n       -       2       pipe
+-#  flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension}
+-#mailman   unix  -       n       n       -       -       pipe
+-#  flags=FRX user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py ${nexthop} ${user}
diff --git a/tasks/main.yml b/tasks/main.yml
index 39edaa7..38d0bc2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -168,13 +168,21 @@
   when:
     - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int() == 20)
 
-- name: postfix master.cf ubuntu22-99
+- name: postfix master.cf ubuntu22
   tags: postfix
   patch:
     src: postfix_master.cf.patch.ubuntu22.04
     dest: /etc/postfix/master.cf
   when:
-    - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int() >= 22)
+    - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int() == 22)
+
+- name: postfix master.cf ubuntu24-99
+  tags: postfix
+  patch:
+    src: postfix_master.cf.patch.ubuntu24.04
+    dest: /etc/postfix/master.cf
+  when:
+    - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int() >= 24)
 
 - name: postfix master.cf redhat
   tags: postfix