From b494b8052027910a784f0221ca095d253fddd9d1 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Fri, 11 Jul 2025 03:16:16 +0200 Subject: [PATCH] Fixed refactoring bugs of role namis --- roles/alert-compose/vars/main.yml | 1 + roles/alert-email/vars/main.yml | 3 ++- roles/alert-telegram/vars/main.yml | 5 +++-- roles/categories.yml | 8 ++++---- roles/core-daemon/vars/main.yml | 1 + roles/core-journalctl/vars/main.yml | 1 + roles/core-security/vars/main.yml | 1 + roles/core-sshd/vars/main.yml | 1 + roles/core-sudo/vars/main.yml | 1 + roles/desk-git/vars/main.yml | 2 +- roles/gen-aur-helper/vars/main.yml | 1 + roles/gen-certbot/vars/main.yml | 1 + roles/gen-fakeroot/vars/main.yml | 1 + roles/gen-gcc/vars/main.yml | 1 + roles/gen-git/vars/main.yml | 1 + roles/gen-hostname/vars/main.yml | 1 + roles/gen-hunspell/vars/main.yml | 1 + roles/gen-java/vars/main.yml | 1 + roles/gen-locales/vars/main.yml | 1 + roles/gen-make/vars/main.yml | 1 + roles/gen-msmtp/vars/main.yml | 1 + roles/gen-nodejs/vars/main.yml | 1 + roles/gen-npm/vars/main.yml | 1 + roles/gen-postfix/vars/main.yml | 1 + roles/gen-python-pip/vars/main.yml | 1 + roles/gen-python-yaml/vars/main.yml | 1 + roles/gen-shell/vars/main.yml | 1 + roles/gen-timer/vars/main.yml | 1 + roles/mon-bot-btrfs/vars/main.yml | 3 ++- roles/mon-bot-csp/vars/main.yml | 5 +++-- roles/mon-bot-disc-space/vars/main.yml | 3 ++- roles/mon-bot-docker-container/vars/main.yml | 3 ++- roles/mon-bot-docker-volumes/vars/main.yml | 3 ++- roles/mon-bot-journalctl/vars/main.yml | 3 ++- roles/mon-bot-msmtp/vars/main.yml | 3 ++- roles/mon-bot-webserver/vars/main.yml | 3 ++- 36 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 roles/alert-compose/vars/main.yml create mode 100644 roles/core-daemon/vars/main.yml create mode 100644 roles/core-journalctl/vars/main.yml create mode 100644 roles/core-security/vars/main.yml create mode 100644 roles/core-sshd/vars/main.yml create mode 100644 roles/core-sudo/vars/main.yml create mode 100644 roles/gen-aur-helper/vars/main.yml create mode 100644 roles/gen-certbot/vars/main.yml create mode 100644 roles/gen-fakeroot/vars/main.yml create mode 100644 roles/gen-gcc/vars/main.yml create mode 100644 roles/gen-git/vars/main.yml create mode 100644 roles/gen-hostname/vars/main.yml create mode 100644 roles/gen-hunspell/vars/main.yml create mode 100644 roles/gen-java/vars/main.yml create mode 100644 roles/gen-locales/vars/main.yml create mode 100644 roles/gen-make/vars/main.yml create mode 100644 roles/gen-msmtp/vars/main.yml create mode 100644 roles/gen-nodejs/vars/main.yml create mode 100644 roles/gen-npm/vars/main.yml create mode 100644 roles/gen-postfix/vars/main.yml create mode 100644 roles/gen-python-pip/vars/main.yml create mode 100644 roles/gen-python-yaml/vars/main.yml create mode 100644 roles/gen-shell/vars/main.yml create mode 100644 roles/gen-timer/vars/main.yml diff --git a/roles/alert-compose/vars/main.yml b/roles/alert-compose/vars/main.yml new file mode 100644 index 00000000..435127f4 --- /dev/null +++ b/roles/alert-compose/vars/main.yml @@ -0,0 +1 @@ +application_id: compose diff --git a/roles/alert-email/vars/main.yml b/roles/alert-email/vars/main.yml index 767c8f76..8dcd52a1 100644 --- a/roles/alert-email/vars/main.yml +++ b/roles/alert-email/vars/main.yml @@ -1 +1,2 @@ -systemd_notifier_email_folder: "{{path_administrator_scripts}}alert-email/" \ No newline at end of file +systemd_notifier_email_folder: '{{path_administrator_scripts}}alert-email/' +application_id: email diff --git a/roles/alert-telegram/vars/main.yml b/roles/alert-telegram/vars/main.yml index d557ab3a..20c4ecd0 100644 --- a/roles/alert-telegram/vars/main.yml +++ b/roles/alert-telegram/vars/main.yml @@ -1,2 +1,3 @@ -systemd_telegram_folder: "/opt/ansible-roles/alert-telegram/" -systemd_telegram_script: "{{systemd_telegram_folder}}alert-telegram.sh" +systemd_telegram_folder: /opt/ansible-roles/alert-telegram/ +systemd_telegram_script: '{{systemd_telegram_folder}}alert-telegram.sh' +application_id: telegram diff --git a/roles/categories.yml b/roles/categories.yml index a98cfafa..78d64aa3 100644 --- a/roles/categories.yml +++ b/roles/categories.yml @@ -3,7 +3,7 @@ roles: title: "Core & System" description: "Fundamental system configuration" icon: "fas fa-cogs" - invokable: false + invokable: true drv: title: "Drivers" description: "Roles for installing and configuring hardware drivers—covering printers, graphics, input devices, and other peripheral support." @@ -13,7 +13,7 @@ roles: title: "Generic" description: "Helper roles & installers (git, locales, timer, etc.)" icon: "fas fa-wrench" - invokable: false + invokable: true desk: title: "Desktop" description: "Desktop environment roles & apps (GNOME, browser, LibreOffice, etc.)" @@ -77,12 +77,12 @@ roles: title: "Monitoring" description: "Roles for system monitoring and health checks—encompassing bot-style automated checks and core low-level monitors for logs, containers, disk usage, and more." icon: "fas fa-chart-area" - invokable: false + invokable: true alert: title: "Alerting" description: "Notification handlers for system events" icon: "fas fa-bell" - invokable: false + invokable: true maint: title: "Maintenance & Healing" description: "Periodic maintenance & auto-recovery" diff --git a/roles/core-daemon/vars/main.yml b/roles/core-daemon/vars/main.yml new file mode 100644 index 00000000..bfc43923 --- /dev/null +++ b/roles/core-daemon/vars/main.yml @@ -0,0 +1 @@ +application_id: daemon diff --git a/roles/core-journalctl/vars/main.yml b/roles/core-journalctl/vars/main.yml new file mode 100644 index 00000000..20414dcf --- /dev/null +++ b/roles/core-journalctl/vars/main.yml @@ -0,0 +1 @@ +application_id: journalctl diff --git a/roles/core-security/vars/main.yml b/roles/core-security/vars/main.yml new file mode 100644 index 00000000..52e5a494 --- /dev/null +++ b/roles/core-security/vars/main.yml @@ -0,0 +1 @@ +application_id: security diff --git a/roles/core-sshd/vars/main.yml b/roles/core-sshd/vars/main.yml new file mode 100644 index 00000000..5c4a4098 --- /dev/null +++ b/roles/core-sshd/vars/main.yml @@ -0,0 +1 @@ +application_id: sshd diff --git a/roles/core-sudo/vars/main.yml b/roles/core-sudo/vars/main.yml new file mode 100644 index 00000000..5a574666 --- /dev/null +++ b/roles/core-sudo/vars/main.yml @@ -0,0 +1 @@ +application_id: sudo diff --git a/roles/desk-git/vars/main.yml b/roles/desk-git/vars/main.yml index cae5cba5..efcbd7f8 100644 --- a/roles/desk-git/vars/main.yml +++ b/roles/desk-git/vars/main.yml @@ -1 +1 @@ -application_id: git +application_id: desk-git diff --git a/roles/gen-aur-helper/vars/main.yml b/roles/gen-aur-helper/vars/main.yml new file mode 100644 index 00000000..42804b18 --- /dev/null +++ b/roles/gen-aur-helper/vars/main.yml @@ -0,0 +1 @@ +application_id: aur-helper diff --git a/roles/gen-certbot/vars/main.yml b/roles/gen-certbot/vars/main.yml new file mode 100644 index 00000000..87118717 --- /dev/null +++ b/roles/gen-certbot/vars/main.yml @@ -0,0 +1 @@ +application_id: certbot diff --git a/roles/gen-fakeroot/vars/main.yml b/roles/gen-fakeroot/vars/main.yml new file mode 100644 index 00000000..1ccf2e71 --- /dev/null +++ b/roles/gen-fakeroot/vars/main.yml @@ -0,0 +1 @@ +application_id: fakeroot diff --git a/roles/gen-gcc/vars/main.yml b/roles/gen-gcc/vars/main.yml new file mode 100644 index 00000000..5dfbb0cd --- /dev/null +++ b/roles/gen-gcc/vars/main.yml @@ -0,0 +1 @@ +application_id: gcc diff --git a/roles/gen-git/vars/main.yml b/roles/gen-git/vars/main.yml new file mode 100644 index 00000000..cae5cba5 --- /dev/null +++ b/roles/gen-git/vars/main.yml @@ -0,0 +1 @@ +application_id: git diff --git a/roles/gen-hostname/vars/main.yml b/roles/gen-hostname/vars/main.yml new file mode 100644 index 00000000..4671f5ad --- /dev/null +++ b/roles/gen-hostname/vars/main.yml @@ -0,0 +1 @@ +application_id: hostname diff --git a/roles/gen-hunspell/vars/main.yml b/roles/gen-hunspell/vars/main.yml new file mode 100644 index 00000000..b72d0597 --- /dev/null +++ b/roles/gen-hunspell/vars/main.yml @@ -0,0 +1 @@ +application_id: hunspell diff --git a/roles/gen-java/vars/main.yml b/roles/gen-java/vars/main.yml new file mode 100644 index 00000000..c6c00de3 --- /dev/null +++ b/roles/gen-java/vars/main.yml @@ -0,0 +1 @@ +application_id: java diff --git a/roles/gen-locales/vars/main.yml b/roles/gen-locales/vars/main.yml new file mode 100644 index 00000000..868a4b92 --- /dev/null +++ b/roles/gen-locales/vars/main.yml @@ -0,0 +1 @@ +application_id: locales diff --git a/roles/gen-make/vars/main.yml b/roles/gen-make/vars/main.yml new file mode 100644 index 00000000..42ce7798 --- /dev/null +++ b/roles/gen-make/vars/main.yml @@ -0,0 +1 @@ +application_id: make diff --git a/roles/gen-msmtp/vars/main.yml b/roles/gen-msmtp/vars/main.yml new file mode 100644 index 00000000..8fb6e613 --- /dev/null +++ b/roles/gen-msmtp/vars/main.yml @@ -0,0 +1 @@ +application_id: msmtp diff --git a/roles/gen-nodejs/vars/main.yml b/roles/gen-nodejs/vars/main.yml new file mode 100644 index 00000000..7b0e495a --- /dev/null +++ b/roles/gen-nodejs/vars/main.yml @@ -0,0 +1 @@ +application_id: nodejs diff --git a/roles/gen-npm/vars/main.yml b/roles/gen-npm/vars/main.yml new file mode 100644 index 00000000..e95e1e56 --- /dev/null +++ b/roles/gen-npm/vars/main.yml @@ -0,0 +1 @@ +application_id: npm diff --git a/roles/gen-postfix/vars/main.yml b/roles/gen-postfix/vars/main.yml new file mode 100644 index 00000000..ce279df6 --- /dev/null +++ b/roles/gen-postfix/vars/main.yml @@ -0,0 +1 @@ +application_id: postfix diff --git a/roles/gen-python-pip/vars/main.yml b/roles/gen-python-pip/vars/main.yml new file mode 100644 index 00000000..af664591 --- /dev/null +++ b/roles/gen-python-pip/vars/main.yml @@ -0,0 +1 @@ +application_id: python-pip diff --git a/roles/gen-python-yaml/vars/main.yml b/roles/gen-python-yaml/vars/main.yml new file mode 100644 index 00000000..1684b1a7 --- /dev/null +++ b/roles/gen-python-yaml/vars/main.yml @@ -0,0 +1 @@ +application_id: python-yaml diff --git a/roles/gen-shell/vars/main.yml b/roles/gen-shell/vars/main.yml new file mode 100644 index 00000000..787323b8 --- /dev/null +++ b/roles/gen-shell/vars/main.yml @@ -0,0 +1 @@ +application_id: shell diff --git a/roles/gen-timer/vars/main.yml b/roles/gen-timer/vars/main.yml new file mode 100644 index 00000000..78f57199 --- /dev/null +++ b/roles/gen-timer/vars/main.yml @@ -0,0 +1 @@ +application_id: timer diff --git a/roles/mon-bot-btrfs/vars/main.yml b/roles/mon-bot-btrfs/vars/main.yml index d3cd6532..093cfecb 100644 --- a/roles/mon-bot-btrfs/vars/main.yml +++ b/roles/mon-bot-btrfs/vars/main.yml @@ -1 +1,2 @@ -docker_health_btrfs_folder: "{{path_administrator_scripts}}mon-bot-btrfs/" \ No newline at end of file +docker_health_btrfs_folder: '{{path_administrator_scripts}}mon-bot-btrfs/' +application_id: bot-btrfs diff --git a/roles/mon-bot-csp/vars/main.yml b/roles/mon-bot-csp/vars/main.yml index e0c8f7b8..5cdd5a7a 100644 --- a/roles/mon-bot-csp/vars/main.yml +++ b/roles/mon-bot-csp/vars/main.yml @@ -1,2 +1,3 @@ -health_csp_crawler_folder: "{{ path_administrator_scripts }}mon-bot-csp/" -health_csp_crawler_script: "{{ health_csp_crawler_folder }}mon-bot-csp.py" \ No newline at end of file +health_csp_crawler_folder: '{{ path_administrator_scripts }}mon-bot-csp/' +health_csp_crawler_script: '{{ health_csp_crawler_folder }}mon-bot-csp.py' +application_id: bot-csp diff --git a/roles/mon-bot-disc-space/vars/main.yml b/roles/mon-bot-disc-space/vars/main.yml index 588708df..4cfe1bcd 100644 --- a/roles/mon-bot-disc-space/vars/main.yml +++ b/roles/mon-bot-disc-space/vars/main.yml @@ -1 +1,2 @@ -health_disc_space_folder: "{{path_administrator_scripts}}mon-bot-disc-space/" \ No newline at end of file +health_disc_space_folder: '{{path_administrator_scripts}}mon-bot-disc-space/' +application_id: bot-disc-space diff --git a/roles/mon-bot-docker-container/vars/main.yml b/roles/mon-bot-docker-container/vars/main.yml index 978e5320..ebacad67 100644 --- a/roles/mon-bot-docker-container/vars/main.yml +++ b/roles/mon-bot-docker-container/vars/main.yml @@ -1 +1,2 @@ -health_docker_container_folder: "{{path_administrator_scripts}}mon-bot-docker-container/" \ No newline at end of file +health_docker_container_folder: '{{path_administrator_scripts}}mon-bot-docker-container/' +application_id: bot-docker-container diff --git a/roles/mon-bot-docker-volumes/vars/main.yml b/roles/mon-bot-docker-volumes/vars/main.yml index fcbc992b..1d190ee6 100644 --- a/roles/mon-bot-docker-volumes/vars/main.yml +++ b/roles/mon-bot-docker-volumes/vars/main.yml @@ -1 +1,2 @@ -health_docker_volumes_folder: "{{path_administrator_scripts}}mon-bot-docker-volumes/" \ No newline at end of file +health_docker_volumes_folder: '{{path_administrator_scripts}}mon-bot-docker-volumes/' +application_id: bot-docker-volumes diff --git a/roles/mon-bot-journalctl/vars/main.yml b/roles/mon-bot-journalctl/vars/main.yml index cb30ebe0..d286ac02 100644 --- a/roles/mon-bot-journalctl/vars/main.yml +++ b/roles/mon-bot-journalctl/vars/main.yml @@ -1 +1,2 @@ -health_journalctl_folder: "{{path_administrator_scripts}}mon-bot-journalctl/" \ No newline at end of file +health_journalctl_folder: '{{path_administrator_scripts}}mon-bot-journalctl/' +application_id: bot-journalctl diff --git a/roles/mon-bot-msmtp/vars/main.yml b/roles/mon-bot-msmtp/vars/main.yml index 0cc56857..992eb5fc 100644 --- a/roles/mon-bot-msmtp/vars/main.yml +++ b/roles/mon-bot-msmtp/vars/main.yml @@ -1 +1,2 @@ -health_msmtp_folder: "{{ path_administrator_scripts }}mon-bot-msmtp/" \ No newline at end of file +health_msmtp_folder: '{{ path_administrator_scripts }}mon-bot-msmtp/' +application_id: bot-msmtp diff --git a/roles/mon-bot-webserver/vars/main.yml b/roles/mon-bot-webserver/vars/main.yml index a232f0f1..bff79253 100644 --- a/roles/mon-bot-webserver/vars/main.yml +++ b/roles/mon-bot-webserver/vars/main.yml @@ -1 +1,2 @@ -health_nginx_folder: "{{ path_administrator_scripts }}mon-bot-webserver/" +health_nginx_folder: '{{ path_administrator_scripts }}mon-bot-webserver/' +application_id: bot-webserver