summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2023-08-31 16:10:07 +0200
committerChristian Pointner <equinox@spreadspace.org>2023-08-31 16:10:07 +0200
commitade19113fb040bb3ffa8bb3efcbc4981eeaaf200 (patch)
treef148540fd77d8908f4e36cd6e31fa5317752c524
parentsk-coudio: pix.elevate.at has been moved and wolke.elevate.at does no longer ... (diff)
replace remaining old-school assertions with assert and undef
-rw-r--r--roles/info-beamer/config/defaults/main.yml3
-rw-r--r--roles/info-beamer/config/tasks/main.yml5
-rw-r--r--roles/x509/acmetool/base/tasks/main.yml6
3 files changed, 4 insertions, 10 deletions
diff --git a/roles/info-beamer/config/defaults/main.yml b/roles/info-beamer/config/defaults/main.yml
index 0a81c865..45bf05c6 100644
--- a/roles/info-beamer/config/defaults/main.yml
+++ b/roles/info-beamer/config/defaults/main.yml
@@ -1,6 +1,5 @@
---
-## path to the info-beamer boot partition
-# info_beamer_base_path:
+info_beamer_base_path: "{{ undef(hint='You must specify the path to the mounted info-beamer boot partition') }}"
info_beamer_hdmi_resolutions:
2160p25:
diff --git a/roles/info-beamer/config/tasks/main.yml b/roles/info-beamer/config/tasks/main.yml
index c603d11c..734f6842 100644
--- a/roles/info-beamer/config/tasks/main.yml
+++ b/roles/info-beamer/config/tasks/main.yml
@@ -1,9 +1,4 @@
---
-- name: check if info-beamer base directory is configured
- debug:
- msg: "check if base directory is set"
- failed_when: not info_beamer_base_path
-
- name: remove existing config directory
file:
path: "{{ info_beamer_base_path }}/config"
diff --git a/roles/x509/acmetool/base/tasks/main.yml b/roles/x509/acmetool/base/tasks/main.yml
index 87d9343e..c2934b38 100644
--- a/roles/x509/acmetool/base/tasks/main.yml
+++ b/roles/x509/acmetool/base/tasks/main.yml
@@ -1,8 +1,8 @@
---
- name: check if acmetool package is new enough
- debug:
- msg: "Check distribution_release"
- failed_when: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) < 9) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) < 17) or (ansible_distribution != 'Debian' and ansible_distribution != 'Ubuntu')
+ assert:
+ msg: "Your distribution does contain an outdated version of acmetool"
+ that: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) >= 11) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) >= 20)
- name: install needed packages
apt: