From 292918da818d43158c01258a5094b79cf1136920 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Thu, 10 Jul 2025 23:40:18 +0200
Subject: [PATCH] Implemented auto creation of role groups

---
 Makefile                              | 3 +--
 roles/web-app-portfolio/meta/main.yml | 4 +---
 roles/web-svc-html/meta/main.yml      | 5 +++--
 tasks/plays/02_personal-computer.yml  | 8 ++++++++
 tasks/plays/02_server.yml             | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f2614aeb..e650da23 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,7 @@ USERS_OUT           := ./group_vars/all/03_users.yml
 USERS_SCRIPT        := ./cli/generate/defaults/users.py
 INCLUDES_SCRIPT     := ./cli/generate/conditional_role_include.py
 
-# Define the prefixes for which we want individual role-include files
-INCLUDE_GROUPS      := "drv-" "svc-" "desk-" "web-" "util-"
+INCLUDE_GROUPS := $(shell python3 main.py meta invokable_paths -s "-" | tr '\n' ' ')
 
 # Directory where these include-files will be written
 INCLUDES_OUT_DIR    := ./tasks/groups
diff --git a/roles/web-app-portfolio/meta/main.yml b/roles/web-app-portfolio/meta/main.yml
index f2bb9368..dd6bbbe4 100644
--- a/roles/web-app-portfolio/meta/main.yml
+++ b/roles/web-app-portfolio/meta/main.yml
@@ -23,6 +23,4 @@ galaxy_info:
   issue_tracker_url: "https://github.com/kevinveenbirkenbach/portfolio/issues"
   documentation: "https://github.com/kevinveenbirkenbach/portfolio#readme"
   logo:
-    class: "fa-solid fa-briefcase"
-  run_after:
-  - web-svc-simpleicons
\ No newline at end of file
+    class: "fa-solid fa-briefcase"
\ No newline at end of file
diff --git a/roles/web-svc-html/meta/main.yml b/roles/web-svc-html/meta/main.yml
index f4d5c04f..ffe29de9 100644
--- a/roles/web-svc-html/meta/main.yml
+++ b/roles/web-svc-html/meta/main.yml
@@ -26,8 +26,9 @@ galaxy_info:
   repository: "https://s.veen.world/cymais"
   issue_tracker_url: "https://s.veen.world/cymaisissues"
   documentation: "https://s.veen.world/cymais"
-  run_after:
-    - web-app-matomo
+#  This propably leads to problems at a point, @todo solve it
+#  run_after:
+#    - web-app-matomo
 dependencies:
   - srv-web-7-6-https
   - gen-git
diff --git a/tasks/plays/02_personal-computer.yml b/tasks/plays/02_personal-computer.yml
index d7203f4c..b30ef830 100644
--- a/tasks/plays/02_personal-computer.yml
+++ b/tasks/plays/02_personal-computer.yml
@@ -1,5 +1,13 @@
 ---
 ## pc applications
+- name: "setup docker role includes for desktop pc"
+  include_tasks: "./tasks/groups/{{ item }}-roles.yml"
+  loop:
+    - util-desk
+    - desk
+  loop_control:
+    label: "{{ item }}-roles.yml"
+
 - name: general host setup
   when: ("personal_computers" in group_names)
   include_role:
diff --git a/tasks/plays/02_server.yml b/tasks/plays/02_server.yml
index 710d6370..c508b709 100644
--- a/tasks/plays/02_server.yml
+++ b/tasks/plays/02_server.yml
@@ -11,7 +11,7 @@
     - mon-bot-btrfs
     - maint-btrfs-auto-balancer
 
-- name: "Integrate Docker Role includes"
+- name: "Integrate Docker Server Roles"
   include_tasks: "./tasks/groups/{{ item }}-roles.yml"
   loop:
     - svc