From cebe1eb957679c5eb00908e3e4d9c89d8704e23d Mon Sep 17 00:00:00 2001 From: uumas Date: Sat, 5 Apr 2025 00:44:05 +0300 Subject: [PATCH] Make compatchecks deduplicatable --- roles/automatic_updates/meta/main.yaml | 9 +++++++++ roles/automatic_updates/tasks/main.yaml | 10 ---------- roles/borgmatic/meta/main.yaml | 9 +++++++++ roles/borgmatic/tasks/main.yaml | 10 ---------- roles/caddy/meta/main.yaml | 9 +++++++++ roles/caddy/tasks/main.yaml | 10 ---------- roles/example/meta/main.yaml | 12 ++++++++++++ roles/example/tasks/main.yaml | 13 ------------- roles/locale/meta/main.yaml | 11 +++++++++++ roles/locale/tasks/main.yaml | 12 ------------ roles/prometheus_node_exporter/meta/main.yaml | 9 +++++++++ roles/prometheus_node_exporter/tasks/main.yaml | 10 ---------- roles/users/meta/main.yaml | 11 +++++++++++ roles/users/tasks/main.yaml | 12 ------------ 14 files changed, 70 insertions(+), 77 deletions(-) create mode 100644 roles/automatic_updates/meta/main.yaml create mode 100644 roles/borgmatic/meta/main.yaml create mode 100644 roles/caddy/meta/main.yaml create mode 100644 roles/example/meta/main.yaml create mode 100644 roles/locale/meta/main.yaml create mode 100644 roles/prometheus_node_exporter/meta/main.yaml create mode 100644 roles/users/meta/main.yaml diff --git a/roles/automatic_updates/meta/main.yaml b/roles/automatic_updates/meta/main.yaml new file mode 100644 index 0000000..c2f67a7 --- /dev/null +++ b/roles/automatic_updates/meta/main.yaml @@ -0,0 +1,9 @@ +--- +dependencies: + - role: uumas.general.compatcheck + vars: + compatcheck_supported_distributions: + - name: debian + version_min: 11 + - name: ubuntu + version_min: 22 diff --git a/roles/automatic_updates/tasks/main.yaml b/roles/automatic_updates/tasks/main.yaml index 74a181b..aaf1fae 100644 --- a/roles/automatic_updates/tasks/main.yaml +++ b/roles/automatic_updates/tasks/main.yaml @@ -1,14 +1,4 @@ --- -- name: Ensure host distribution is supported - ansible.builtin.import_role: - name: compatcheck - vars: - compatcheck_supported_distributions: - - name: debian - version_min: 11 - - name: ubuntu - version_min: 22 - - name: Install unatteded-upgrades ansible.builtin.apt: name: unattended-upgrades diff --git a/roles/borgmatic/meta/main.yaml b/roles/borgmatic/meta/main.yaml new file mode 100644 index 0000000..d322ec7 --- /dev/null +++ b/roles/borgmatic/meta/main.yaml @@ -0,0 +1,9 @@ +--- +dependencies: + - role: uumas.general.compatcheck + vars: + compatcheck_supported_distributions: + - name: debian + version_min: 11 + - name: ubuntu + version_min: 22 diff --git a/roles/borgmatic/tasks/main.yaml b/roles/borgmatic/tasks/main.yaml index 6152c70..4ad1baa 100644 --- a/roles/borgmatic/tasks/main.yaml +++ b/roles/borgmatic/tasks/main.yaml @@ -1,14 +1,4 @@ --- -- name: Ensure host distribution is supported - ansible.builtin.import_role: - name: compatcheck - vars: - compatcheck_supported_distributions: - - name: debian - version_min: 11 - - name: ubuntu - version_min: 22 - - name: Install borgmatic ansible.builtin.apt: name: borgmatic diff --git a/roles/caddy/meta/main.yaml b/roles/caddy/meta/main.yaml new file mode 100644 index 0000000..d322ec7 --- /dev/null +++ b/roles/caddy/meta/main.yaml @@ -0,0 +1,9 @@ +--- +dependencies: + - role: uumas.general.compatcheck + vars: + compatcheck_supported_distributions: + - name: debian + version_min: 11 + - name: ubuntu + version_min: 22 diff --git a/roles/caddy/tasks/main.yaml b/roles/caddy/tasks/main.yaml index d390224..aa701f9 100644 --- a/roles/caddy/tasks/main.yaml +++ b/roles/caddy/tasks/main.yaml @@ -1,14 +1,4 @@ --- -- name: Ensure host distribution is supported - ansible.builtin.import_role: - name: compatcheck - vars: - compatcheck_supported_distributions: - - name: debian - version_min: 11 - - name: ubuntu - version_min: 22 - - name: Ensure legacy caddy apt repository not present ansible.builtin.file: path: /etc/apt/sources.list.d/caddy-stable.list diff --git a/roles/example/meta/main.yaml b/roles/example/meta/main.yaml new file mode 100644 index 0000000..4a9be7a --- /dev/null +++ b/roles/example/meta/main.yaml @@ -0,0 +1,12 @@ +--- +dependencies: + - role: uumas.general.compatcheck + vars: + compatcheck_supported_distributions: + - name: debian + version_min: 8 + - name: archlinux + - name: ubuntu + version_min: 16 + - name: fedora + version_min: 29 diff --git a/roles/example/tasks/main.yaml b/roles/example/tasks/main.yaml index c3e044e..a1f4068 100644 --- a/roles/example/tasks/main.yaml +++ b/roles/example/tasks/main.yaml @@ -1,17 +1,4 @@ --- -- name: Ensure host distribution is supported - ansible.builtin.import_role: - name: compatcheck - vars: - compatcheck_supported_distributions: - - name: debian - version_min: 8 - - name: archlinux - - name: ubuntu - version_min: 16 - - name: fedora - version_min: 29 - - name: Ping ansible.builtin.ping: when: example_ping diff --git a/roles/locale/meta/main.yaml b/roles/locale/meta/main.yaml new file mode 100644 index 0000000..cd5997a --- /dev/null +++ b/roles/locale/meta/main.yaml @@ -0,0 +1,11 @@ +--- +dependencies: + - role: uumas.general.compatcheck + vars: + compatcheck_supported_distributions: + - name: debian + version_min: 10 + - name: ubuntu + version_min: 24 + - name: fedora + version_min: 39 diff --git a/roles/locale/tasks/main.yaml b/roles/locale/tasks/main.yaml index 15f5c10..21cfb3c 100644 --- a/roles/locale/tasks/main.yaml +++ b/roles/locale/tasks/main.yaml @@ -1,16 +1,4 @@ --- -- name: Ensure host distribution is supported - ansible.builtin.import_role: - name: compatcheck - vars: - compatcheck_supported_distributions: - - name: debian - version_min: 10 - - name: ubuntu - version_min: 24 - - name: fedora - version_min: 39 - - name: Include variables for os family {{ ansible_os_family }} ansible.builtin.include_vars: "{{ ansible_os_family }}.yaml" diff --git a/roles/prometheus_node_exporter/meta/main.yaml b/roles/prometheus_node_exporter/meta/main.yaml new file mode 100644 index 0000000..f6fde53 --- /dev/null +++ b/roles/prometheus_node_exporter/meta/main.yaml @@ -0,0 +1,9 @@ +--- +dependencies: + - role: uumas.general.compatcheck + vars: + compatcheck_supported_distributions: + - name: debian + version_min: 11 + - name: ubuntu + version_min: 24 diff --git a/roles/prometheus_node_exporter/tasks/main.yaml b/roles/prometheus_node_exporter/tasks/main.yaml index 1b820f1..1433b1f 100644 --- a/roles/prometheus_node_exporter/tasks/main.yaml +++ b/roles/prometheus_node_exporter/tasks/main.yaml @@ -1,14 +1,4 @@ --- -- name: Ensure host distribution is supported - ansible.builtin.import_role: - name: compatcheck - vars: - compatcheck_supported_distributions: - - name: debian - version_min: 11 - - name: ubuntu - version_min: 24 - - name: Install prometheus node exporter ansible.builtin.apt: name: prometheus-node-exporter diff --git a/roles/users/meta/main.yaml b/roles/users/meta/main.yaml new file mode 100644 index 0000000..11899f8 --- /dev/null +++ b/roles/users/meta/main.yaml @@ -0,0 +1,11 @@ +--- +dependencies: + - role: uumas.general.compatcheck + vars: + compatcheck_supported_distributions: + - name: debian + version_min: 11 + - name: ubuntu + version_min: 22 + - name: fedora + version_min: 39 diff --git a/roles/users/tasks/main.yaml b/roles/users/tasks/main.yaml index aa5d516..672edfb 100644 --- a/roles/users/tasks/main.yaml +++ b/roles/users/tasks/main.yaml @@ -1,16 +1,4 @@ --- -- name: Ensure host distribution is supported - ansible.builtin.import_role: - name: compatcheck - vars: - compatcheck_supported_distributions: - - name: debian - version_min: 11 - - name: ubuntu - version_min: 22 - - name: fedora - version_min: 39 - - name: Ensure sudo is installed ansible.builtin.package: name: sudo