refactor: remove distro specific setup in favor of lstig.gpg role

lstig · Feb 10, 2024 · 5d7cd00 · 5d7cd00
1 parent bced0ee
commit 5d7cd00
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -1,5 +1,6 @@
 ---
-dependencies: []
+dependencies:
+  - lstig.gpg
 
 galaxy_info:
   role_name: matchbox

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -2,18 +2,6 @@
 - name: Include variables
   ansible.builtin.include_vars: main.yml
 
-- name: Distribution specific setup
-  ansible.builtin.include_tasks: "{{ item }}"
-  with_first_found:
-    - files:
-        - setup/{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}.yml
-        - setup/{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}.yml
-        - setup/{{ ansible_facts['distribution'] }}.yml
-        - setup/{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_version'] }}.yml
-        - setup/{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_major_version'] }}.yml
-        - setup/{{ ansible_facts['os_family'] }}.yml
-      skip: true
-
 - name: Check matchbox version
   ansible.builtin.command: "{{ matchbox_bin_directory }}/matchbox --version"
   register: _result

diff --git a/tasks/setup/Debian.yml b/tasks/setup/Debian.yml
diff --git a/tasks/setup/Ubuntu.yml b/tasks/setup/Ubuntu.yml