Skip to content

Commit

Permalink
Remove ansible conditionals for focal
Browse files Browse the repository at this point in the history
This is a no-op, but will ensure these steps are run in noble.

Refs #7210.
  • Loading branch information
legoktm committed Aug 5, 2024
1 parent 8e73944 commit f380b49
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
3 changes: 1 addition & 2 deletions install_files/ansible-base/roles/common/tasks/harden_dns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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";
2 changes: 0 additions & 2 deletions install_files/ansible-base/roles/postfix/templates/main.cf
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

0 comments on commit f380b49

Please sign in to comment.