diff --git a/files/default_grub.patch.deb13 b/files/default_grub.patch.deb13 new file mode 100644 index 0000000..b30b9aa --- /dev/null +++ b/files/default_grub.patch.deb13 @@ -0,0 +1,22 @@ +--- grub.orig 2025-11-16 12:48:00.039601015 +0100 ++++ grub 2025-11-16 18:27:55.973258293 +0100 +@@ -6,8 +6,8 @@ + GRUB_DEFAULT=0 + GRUB_TIMEOUT=5 + GRUB_DISTRIBUTOR=`( . /etc/os-release && echo ${NAME} )` +-GRUB_CMDLINE_LINUX_DEFAULT="quiet" +-GRUB_CMDLINE_LINUX="" ++GRUB_CMDLINE_LINUX_DEFAULT="" ++GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0" + + # If your computer has multiple operating systems installed, then you + # probably want to run os-prober. However, if your computer is a host +@@ -22,7 +22,7 @@ + #GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef" + + # Uncomment to disable graphical terminal +-#GRUB_TERMINAL=console ++GRUB_TERMINAL=console + + # The resolution used on graphical terminal + # note that you can use only modes which your graphic card supports via VBE/GOP/UGA diff --git a/files/postfix_master.cf.patch.deb13 b/files/postfix_master.cf.patch.deb13 new file mode 100644 index 0000000..dcdccc3 --- /dev/null +++ b/files/postfix_master.cf.patch.deb13 @@ -0,0 +1,66 @@ +--- master.cf.orig 2025-11-16 18:19:18.068768059 +0100 ++++ master.cf 2025-11-16 18:34:50.377973410 +0100 +@@ -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 +@@ -99,53 +100,3 @@ + #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 -f $sender $nexthop $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/debian.yml b/tasks/debian.yml index c54012d..1c0112a 100644 --- a/tasks/debian.yml +++ b/tasks/debian.yml @@ -306,13 +306,21 @@ when: - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() >= 9 and ansible_distribution_major_version|int() < 12) -- name: grub defaults, debian12-99 +- name: grub defaults, debian12 tags: grub patch: src: default_grub.patch.bookworm dest: /etc/default/grub when: - - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() >= 12) + - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() == 12) + +- name: grub defaults, debian13-99 + tags: grub + patch: + src: default_grub.patch.deb13 + dest: /etc/default/grub + when: + - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() >= 13) - name: grub defaults, ubuntu20-99 tags: grub diff --git a/tasks/main.yml b/tasks/main.yml index 21282ac..39edaa7 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,13 +1,24 @@ --- +# from Debian 13 /tmp is tmpfs - name: /tmp bind mount in fstab lineinfile: dest: /etc/fstab line: '/var/tmp /tmp none bind 0 0' register: fstab_tmp + when: + - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() <= 12) or + ansible_distribution == "Ubuntu" or + ansible_distribution == "RedHat" or + ansible_distribution == "AlmaLinux" - name: mount /tmp shell: 'mv /tmp/ /old-tmp; mkdir /tmp; mount /tmp; mv /old-tmp /tmp' - when: fstab_tmp.changed + when: + - ((ansible_distribution == "Debian" and ansible_distribution_major_version|int() <= 12) or + ansible_distribution == "Ubuntu" or + ansible_distribution == "RedHat" or + ansible_distribution == "AlmaLinux") + and fstab_tmp.changed ############################################################################## # debian-ubuntu /redhat @@ -133,13 +144,21 @@ - (ansible_distribution_major_version|int() == 9) or (ansible_distribution_major_version|int() == 10) -- name: postfix master.cf debian11-99 +- name: postfix master.cf debian11-12 tags: postfix patch: src: postfix_master.cf.patch.bullseye dest: /etc/postfix/master.cf when: - - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() >= 11) + - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() >= 11 and ansible_distribution_major_version|int() <= 12) + +- name: postfix master.cf debian13-99 + tags: postfix + patch: + src: postfix_master.cf.patch.deb13 + dest: /etc/postfix/master.cf + when: + - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() >= 13) - name: postfix master.cf ubuntu20 tags: postfix