From 9055c75ee9567db875831e49bdf3b06f2d078ef3 Mon Sep 17 00:00:00 2001
From: David Lundgren <dlundgren@syberisle.net>
Date: Fri, 7 Jun 2024 16:49:48 -0500
Subject: [PATCH] Use matrix.image properly

---
 .github/workflows/molecule.yml | 8 ++++----
 defaults/main.yml              | 2 ++
 tasks/main.yml                 | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 0f139c9..3f6d8d6 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -22,10 +22,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        config:
-          - image: amazonlinux2
-          - image: ubuntu2204
-          - image: rockylinux8
+        image:
+          - amazonlinux2
+          - ubuntu2204
+          - rockylinux8
     steps:
       - name: checkout
         uses: actions/checkout@v4
diff --git a/defaults/main.yml b/defaults/main.yml
index a92216f..27d67bd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,4 +4,6 @@ bigfix_client_server_name: bigfix.example.com
 bigfix_client_server_port: 52311
 bigfix_client_service_name: besclient
 
+bigfix_client_masthead_url: "http://{{ bigfix_client_server_name }}:{{ bigfix_client_server_port }}/masthead/masthead.afxm"
+
 __bigfix_ansible_distro_arch: "{{ ansible_distribution_version.split('.')[0] }}-{{ ansible_architecture }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index c3b880e..88d594c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,8 +29,8 @@
 - name: Download masthead from BigFix Server
   when: not masthead_file.stat.exists
   ansible.builtin.get_url:
-    url: "http://{{ bigfix_client_server_name }}:{{ bigfix_client_server_port }}/masthead/masthead.afxm"
+    url: "{{ bigfix_client_masthead_url }}"
     dest: "{{ bigfix_client_conf_dir }}/actionsite.afxm"
-    mode: "0644"
+    mode: "644"
   notify:
     - Restart bigfix-client