Huge role refactoring/cleanup. Other commits will propably follow. Because some bugs will exist. Still important for longrun and also for auto docs/help/slideshow generation

tasks/plays/01_constructor.yml

@@ -104,24 +104,23 @@
 - name: setup standard wireguard
   when: ('wireguard_server' | application_allowed(group_names, allowed_applications))
   include_role:
-    name: wireguard
+    name: network-wireguard-core
 
 # vpn setup
 - name: setup wireguard client behind firewall\nat
   when: ('wireguard_behind_firewall' | application_allowed(group_names, allowed_applications))
   include_role:
-    name: client-wireguard-behind-firewall
+    name: network-wireguard-firewalled
 
 - name: setup wireguard client
   when: ('wireguard_client' | application_allowed(group_names, allowed_applications))
   include_role:
-    name: client-wireguard
+    name: network-wireguard-plain
 
 ## backup setup
 - name: setup replica backup hosts
   when: ('backup_remote_to_local' | application_allowed(group_names, allowed_applications))
-  include_role:
-    name: backup-remote-to-local
+  include_role: backup-remote-to-local
 
 - name: setup backup to swappable
   when: ('backup_to_usb' | application_allowed(group_names, allowed_applications))
@@ -149,4 +148,4 @@
 - name: setup swapfile hosts
   when: ('swapfile' | application_allowed(group_names, allowed_applications))
   include_role:
-    name: system-swapfile
+    name: maintenance-swapfile

tasks/plays/02_personal-computer.yml

@@ -14,43 +14,43 @@
     name: "{{ item }}"
   loop:
     - persona-employee
-    - client-jrnl
+    - desktop-jrnl
 
 
 - name: personal computer for business
   when: ("business_personal_computer" in group_names)
   include_role:
-    name: client-gnucash
+    name: desktop-gnucash
 
 - name: persona-designer
   when: ("collection_designer" in group_names)
   include_role:
     name: persona-designer
 
-- name: client-qbittorrent
+- name: desktop-qbittorrent
   when: ("collection_torrent" in group_names)
   include_role:
-    name: client-qbittorrent
+    name: desktop-qbittorrent
 
 - name: persona-streamer
   when: ("collection_streamer" in group_names)
   include_role:
     name: persona-streamer
 
-- name: client-bluray-player
+- name: desktop-bluray-player
   when: ("collection_bluray_player" in group_names)
   include_role:
-    name: client-bluray-player
+    name: desktop-bluray-player
 
 - name: GNOME setup
   when: ("gnome" in group_names)
   include_role:
-    name: client-gnome
+    name: desktop-gnome
 
 - name: setup ssh client
   when: ("ssh-client" in group_names)
   include_role:
-    name: client-ssh
+    name: desktop-ssh
 
 - name: setup gaming hosts
   when: ("gaming" in group_names)
@@ -60,22 +60,22 @@
 - name: setup entertainment hosts
   when: ("entertainment" in group_names)
   include_role:
-    name: client-spotify
+    name: desktop-spotify
 
 - name: setup torbrowser hosts
   when: ("torbrowser" in group_names)
   include_role:
-    name: client-torbrowser
+    name: desktop-torbrowser
 
 - name: setup nextcloud-client
   when: ("nextcloud_client" in group_names)
   include_role:
-    name: client-nextcloud
+    name: desktop-nextcloud
 
 - name: setup docker
   when: ("docker_client" in group_names)
   include_role:
-    name: client-docker
+    name: desktop-docker
 
 # driver 
 - name: setup msi rgb keyboard

tasks/plays/02_server.yml

@@ -4,23 +4,23 @@
   include_role:
     name: "{{ item }}"
   loop:
-    - system-security
-    - journalctl
-    - health-disc-space
+    - core-security
+    - core-journalctl
+    - monitor-bot-disc-space
     - cleanup-disc-space
-    - health-btrfs
-    - system-btrfs-auto-balancer
+    - monitor-bot-btrfs
+    - maintenance-btrfs-auto-balancer
 
 - name: "Integrate Docker Role includes"
-  include_tasks: "./tasks/utils/docker-roles.yml"
+  include_tasks: "./tasks/utils/web-app-roles.yml"
 
 # Native Webserver Roles
-- name: setup nginx-serve-htmls
+- name: setup web-service-htmls
   include_role:
-    name: nginx-serve-html
+    name: web-service-html
   vars:
     domain: "{{primary_domain}}"
-  when: ('nginx-serve-htmls' | application_allowed(group_names, allowed_applications))
+  when: ('web-service-htmls' | application_allowed(group_names, allowed_applications))
 
 - name: "setup corporate identity"
   include_role:
@@ -30,11 +30,11 @@
 - name: setup redirect hosts
   when: ('redirect' | application_allowed(group_names, allowed_applications))
   include_role:
-    name: nginx-redirect-domains
+    name: web-redirect-domains
   vars:
     domain_mappings: "{{ current_play_domain_mappings_redirect}}"
 
 - name: setup www redirect 
   when: ('www_redirect' | application_allowed(group_names, allowed_applications))
   include_role:
-    name: nginx-redirect-www
+    name: web-redirect-www

tasks/plays/03_destructor.yml

@@ -1,6 +1,6 @@
 - name: optimize storage performance
   include_role:
-    name: system-storage-optimizer
+    name: maintenance-docker-storage-optimizer
   when: ('storage-optimizer' | application_allowed(group_names, allowed_applications))
   
 - name: Cleanup Docker Anonymous Volumes