From dc6c08c0e533b0db951a407c5ba30058c24dcab3 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Tue, 5 May 2026 17:07:51 -0500
Subject: [PATCH] More ansible-core 2.20 fixes

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
---
 tasks/main.yml                    |  8 ++++----
 templates/Fedora/43/etc/sudo.conf | 10 +++++-----
 templates/Fedora/44/etc/sudo.conf | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 90d4e02..cded532 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -12,9 +12,9 @@
         - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
         - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
         - '{{ ansible_facts["distribution"] }}-default.yml'
-        - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
-        - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
-        - '{{ ansible_os_family }}-default.yml'
+        - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
+        - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
+        - '{{ ansible_facts["os_family"] }}-default.yml'
         - 'default.yml'
       paths:
         - '../vars/'
@@ -27,7 +27,7 @@
 - name: 'service discovery'
   when:
     - ansible_facts["system"] == 'Linux'
-    - services is not defined
+    - ansible_facts["services"] is not defined
   ansible.builtin.service_facts:
 - name: 'ensure packages'
   when:
diff --git a/templates/Fedora/43/etc/sudo.conf b/templates/Fedora/43/etc/sudo.conf
index a4d5104..1c499a7 100644
--- a/templates/Fedora/43/etc/sudo.conf
+++ b/templates/Fedora/43/etc/sudo.conf
@@ -43,10 +43,10 @@
 #   Path intercept /path/to/sudo_intercept.so
 #
 # Path to a shared library containing replacements for the execv(),
-# execve() and fexecve() library functions, which perform a policy
-# check to verify whether the command is allowed and simply return
-# an error if it is not.  This is used to implement the "intercept"
-# functionality on systems that support LD_PRELOAD or its equivalent.
+# execve() and fexecve() library functions that perform a policy check
+# to verify the command is allowed and simply return an error if not.
+# This is used to implement the "intercept" functionality on systems that
+# support LD_PRELOAD or its equivalent.
 #
 # The compiled-in value is usually sufficient and should only be changed
 # if you rename or move the sudo_intercept.so file.
@@ -72,7 +72,7 @@
 #   Path plugin_dir /path/to/plugins
 #
 # The default directory to use when searching for plugins that are
-# specified without a fully-qualified path name.
+# specified without a fully qualified path name.
 #
 #Path plugin_dir /usr/libexec/sudo
 
diff --git a/templates/Fedora/44/etc/sudo.conf b/templates/Fedora/44/etc/sudo.conf
index a4d5104..1c499a7 100644
--- a/templates/Fedora/44/etc/sudo.conf
+++ b/templates/Fedora/44/etc/sudo.conf
@@ -43,10 +43,10 @@
 #   Path intercept /path/to/sudo_intercept.so
 #
 # Path to a shared library containing replacements for the execv(),
-# execve() and fexecve() library functions, which perform a policy
-# check to verify whether the command is allowed and simply return
-# an error if it is not.  This is used to implement the "intercept"
-# functionality on systems that support LD_PRELOAD or its equivalent.
+# execve() and fexecve() library functions that perform a policy check
+# to verify the command is allowed and simply return an error if not.
+# This is used to implement the "intercept" functionality on systems that
+# support LD_PRELOAD or its equivalent.
 #
 # The compiled-in value is usually sufficient and should only be changed
 # if you rename or move the sudo_intercept.so file.
@@ -72,7 +72,7 @@
 #   Path plugin_dir /path/to/plugins
 #
 # The default directory to use when searching for plugins that are
-# specified without a fully-qualified path name.
+# specified without a fully qualified path name.
 #
 #Path plugin_dir /usr/libexec/sudo