From f380b49ae8f5a812e23d752af3a4d81e23110e2a Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@debian.org>
Date: Mon, 5 Aug 2024 14:07:36 -0400
Subject: [PATCH] Remove ansible conditionals for focal

This is a no-op, but will ensure these steps are run in noble.

Refs #7210.
---
 install_files/ansible-base/roles/common/tasks/harden_dns.yml   | 3 +--
 .../ansible-base/roles/common/templates/80securedrop.j2        | 2 --
 install_files/ansible-base/roles/postfix/templates/main.cf     | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/install_files/ansible-base/roles/common/tasks/harden_dns.yml b/install_files/ansible-base/roles/common/tasks/harden_dns.yml
index ba3b864683..6810be4a83 100644
--- a/install_files/ansible-base/roles/common/tasks/harden_dns.yml
+++ b/install_files/ansible-base/roles/common/tasks/harden_dns.yml
@@ -7,12 +7,11 @@
     - dns
     - hardening
 
-- name: Disable systemd-resolved on Focal
+- name: Disable systemd-resolved
   systemd:
     name: systemd-resolved
     state: stopped
     enabled: no
-  when: ansible_distribution_release == 'focal'
   tags:
     - dns
     - hardening
diff --git a/install_files/ansible-base/roles/common/templates/80securedrop.j2 b/install_files/ansible-base/roles/common/templates/80securedrop.j2
index abce5a74d0..577eebb074 100644
--- a/install_files/ansible-base/roles/common/templates/80securedrop.j2
+++ b/install_files/ansible-base/roles/common/templates/80securedrop.j2
@@ -1,10 +1,8 @@
-{% if ansible_distribution_release == "focal" %}
 // If automatic reboot is enabled and needed, reboot at the specific
 // time instead of immediately
 //  Default: "now"
 Unattended-Upgrade::Automatic-Reboot-Time "{{ daily_reboot_time }}:00";
 APT::Periodic::Enable "1";
-{% endif %}
 // Don't install packages from "Recommends" field, we'll manage dependencies
 // explicitly to avoid pulling in packages from e.g. universe.
 APT::Install-Recommends "false";
diff --git a/install_files/ansible-base/roles/postfix/templates/main.cf b/install_files/ansible-base/roles/postfix/templates/main.cf
index 8c32446deb..54fdb72346 100644
--- a/install_files/ansible-base/roles/postfix/templates/main.cf
+++ b/install_files/ansible-base/roles/postfix/templates/main.cf
@@ -62,7 +62,5 @@ maximal_queue_lifetime = 14d
 # Used to remap outbound from address in emails
 smtp_generic_maps = hash:/etc/postfix/generic
 {% endif %}
-{% if ansible_distribution_release == 'focal' %}
 # Restriction for client RCPT TO command, details at http://www.postfix.org/postconf.5.html#smtpd_recipient_restrictions
 smtpd_recipient_restrictions = reject_unauth_destination
-{% endif %}