Merge branch 'ansible-lockdown:devel' into has_gui

ansible-lockdown · Sep 16, 2024 · 99f99aa · 99f99aa
2 parents f2bf4c2 + cd0c06d
commit 99f99aa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
     license: MIT
     role_name: rhel9_stig
     namespace: mindpointgroup
-    min_ansible_version: 2.15.1
+    min_ansible_version: 2.12.1
     platforms:
         - name: EL
           versions:

diff --git a/tasks/Cat2/RHEL-09-25xxxx.yml b/tasks/Cat2/RHEL-09-25xxxx.yml
@@ -331,9 +331,9 @@
           rhel9stig_network_manager_dns.stdout == 'none' or
           rhel9stig_network_manager_dns.stdout == 'unmanaged'
       ansible.builtin.template:
-        dest: /etc/resolv.conf.j2
+        dest: /etc/resolv.conf
         mode: '0644'
-        src: /etc/resolv.conf
+        src: etc/resolv.conf.j2
 
     - name: "MEDIUM | RHEL-09-252035 | PATCH | RHEL 9 systems using Domain Name Servers (DNS) resolution must have at least two name servers configured."
       when:

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -131,7 +131,6 @@
     file: auditd.yml
 
 - name: Flush handlers
-  when: not audit_only
   ansible.builtin.meta: flush_handlers
 
 - name: Reboot system

diff --git a/templates/etc/resolv.conf.j2 b/templates/etc/resolv.conf.j2
@@ -3,7 +3,7 @@
 # Sponsored by MindPointGroup.com
 {% if rhel9stig_resolv_domains is defined %}
 # Domains
-{% for domains in rhel9stig_resolv_domains
+{% for domains in rhel9stig_resolv_domains %}
 domain {{ rhel9stig_resolv_domains }}
 {% endfor %}
 {% endif %}

diff --git a/vars/main.yml b/vars/main.yml
@@ -1,7 +1,7 @@
 ---
 # vars file for RHEL9-STIG
 
-min_ansible_version: 2.15.1
+min_ansible_version: 2.12.1
 
 rhel9stig_min_supported_os_ver:
     RedHat: "9.2"