Update variable names. Revert to almalinux

tasks/main.yml

@@ -1,9 +1,5 @@
 # Install and configure rsyslog
 ---
-- name: Debugger
-  debug:
-    msg: 'OS Family: {{ ansible_os_family }}'
-
 - name: set OS dependent variables
   tags:
     - rsyslog
@@ -16,15 +12,18 @@
    - "{{ ansible_os_family }}.yml"
    - default.yml
 
-- include: main_rh.yml
+- name: Include Tasks for RHEL
+  include_tasks: main_rh.yml
   when: >
     ansible_os_family == 'RedHat' or 
     ansible_os_family == 'Rocky'
 
-- include: main_deb.yml
+- name: Include Tasks for Debian/Ubuntu
+  include_tasks: main_deb.yml
   when: ansible_os_family == 'Debian'
 
-- include: main_arch.yml
+- name: Include Tasks for Archlinux
+  include_tasks: main_arch.yml
   when: ansible_os_family == 'Archlinux'
 
 - name: setup main configuration
@@ -48,7 +47,7 @@
   file:
     state: absent
     path: "{{ rsyslog_include_path }}/"
-  when: purge_config
+  when: rsyslog_purge_config
 
 - name: create additional configuration directory
   tags:
@@ -102,7 +101,7 @@
     group={{ rsyslog_file_group }}
     mode={{ rsyslog_file_mode }}
   with_items: 
-    - "{{ items }}"
+    - "{{ rsyslog_items }}"
   notify:
     - restart rsyslog
   when: rsyslog_os_supported

tasks/main_arch.yml

@@ -9,5 +9,4 @@
     - packages
   pacman: 
     pkg: '{{ rsyslog_package_names }}'
-    state: installed
-  with_items: '{{ rsyslog_package_names }}'
+    state: installed

tasks/main_deb.yml

@@ -12,7 +12,7 @@
 - name: Enable Adiscon rsyslog apt repo
   apt_repository: repo='deb http://debian.adiscon.com/v8-stable wheezy/' state=present filename='rsyslog' update_cache='yes'
   when: >
-    use_repo and 
+    rsyslog_use_repo and 
     ansible_distribution == 'Debian'
 
 ## TODO: v8-stable/v7-stable available, for "ubuntu versions not yet reached end of life".. sanitize selection
@@ -20,7 +20,7 @@
 - name: Enable Adiscon rsyslog apt repo
   apt_repository: repo='ppa:adiscon/v{{ repo_releasever }}-stable'
   when: >
-    use_repo and 
+    rsyslog_use_repo and 
     ansible_distribution == 'Ubuntu'
 
 - name: install packages for Debian

tasks/main_rh.yml

@@ -15,7 +15,7 @@
   rpm_key: key=http://rpms.adiscon.com/RPM-GPG-KEY-Adiscon state=present
   when: >
     not adiscon_gpg_key.stat.exists and 
-    use_repo
+    rsyslog_use_repo
 
 - name: Enable Adiscon rsyslog yum repo
   tags:
@@ -25,7 +25,7 @@
     src: rsyslog.yum.repo.j2 
     dest: /etc/yum.repos.d/rsyslog.repo
     mode: 0644
-  when: use_repo
+  when: rsyslog_use_repo
 
 - name: install packages for RHEL
   tags: