Finished new role identification system implementation

tasks/plays/02_personal-computer.yml

@@ -1,91 +0,0 @@
----
-## 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:
-    name: "{{ item }}"
-  loop:
-    - util-gen-admin
-    - drv-non-free
-
-- name: util-desk-office-tools
-  when: ("collection_officetools" in group_names)
-  include_role:
-    name: "{{ item }}"
-  loop:
-    - util-desk-office-tools
-    - desk-jrnl
-
-- name: personal computer for business
-  when: ("business_personal_computer" in group_names)
-  include_role:
-    name: desk-gnucash
-
-- name: util-desk-design
-  when: ("collection_designer" in group_names)
-  include_role:
-    name: util-desk-design
-
-- name: desk-qbittorrent
-  when: ("collection_torrent" in group_names)
-  include_role:
-    name: desk-qbittorrent
-
-- name: desk-obs
-  when: ("collection_streamer" in group_names)
-  include_role:
-    name: desk-obs
-
-- name: desk-bluray-player
-  when: ("collection_bluray_player" in group_names)
-  include_role:
-    name: desk-bluray-player
-
-- name: GNOME setup
-  when: ("gnome" in group_names)
-  include_role:
-    name: desk-gnome
-
-- name: setup ssh client
-  when: ("ssh-client" in group_names)
-  include_role:
-    name: desk-ssh
-
-- name: setup gaming hosts
-  when: ("gaming" in group_names)
-  include_role:
-    name: util-desk-game-compose
-
-- name: setup entertainment hosts
-  when: ("entertainment" in group_names)
-  include_role:
-    name: desk-spotify
-
-- name: setup torbrowser hosts
-  when: ("torbrowser" in group_names)
-  include_role:
-    name: desk-torbrowser
-
-- name: setup nextcloud-client
-  when: ("nextcloud_client" in group_names)
-  include_role:
-    name: desk-nextcloud-client
-
-- name: setup docker
-  when: ("docker_client" in group_names)
-  include_role:
-    name: desk-docker
-
-# driver 
-- name: setup msi rgb keyboard
-  when: ("msi_perkeyrgb" in group_names)
-  include_role:
-    name: drv-msi-keyboard-color

tasks/plays/03_destructor.yml

@@ -1,15 +0,0 @@
-- name: optimize storage performance
-  include_role:
-    name: maint-docker-storage-optimizer
-  when: ('storage-optimizer' | application_allowed(group_names, allowed_applications))
-  
-- name: Cleanup Docker Anonymous Volumes
-  import_role:
-    name: cln-docker-anonymous-volumes
-  when: mode_cleanup | bool
-
-- name: Show all facts
-  debug:
-    var: ansible_facts
-  when: enable_debug | bool
-

tasks/stages/01_constructor.yml

@@ -101,7 +101,7 @@
     name: update
   when: mode_update | bool
 
-- name: "Integrate Docker Role includes"
+- name: "Load base roles"
   include_tasks: "./tasks/groups/{{ item }}-roles.yml"
   loop:
     - core
@@ -111,55 +111,8 @@
     - alert
     - mon
     - maint
+    - update
+    - bkp
+    - cln
   loop_control:
-    label: "{{ item }}-roles.yml"
-
-- name: setup standard wireguard
-  when: ('wireguard_server' | application_allowed(group_names, allowed_applications))
-  include_role:
-    name: net-wireguard-core
-
-# vpn setup
-- name: setup wireguard client behind firewall\nat
-  when: ('wireguard_behind_firewall' | application_allowed(group_names, allowed_applications))
-  include_role:
-    name: net-wireguard-firewalled
-
-- name: setup wireguard client
-  when: ('wireguard_client' | application_allowed(group_names, allowed_applications))
-  include_role:
-    name: net-wireguard-plain
-
-## backup setup
-- name: setup replica backup hosts
-  when: ('backup_remote_to_local' | application_allowed(group_names, allowed_applications))
-  include_role:
-    name: bkp-remote-to-local
-
-- name: setup backup to swappable
-  when: ('backup_to_usb' | application_allowed(group_names, allowed_applications))
-  include_role:
-    name: bkp-data-to-usb
-
-## driver setup
-- name: drv-intel
-  when: ('intel' | application_allowed(group_names, allowed_applications))
-  include_role:
-    name: drv-intel
-
-- name: setup multiprinter hosts
-  when: ('epson_multiprinter' | application_allowed(group_names, allowed_applications))
-  include_role:
-    name: drv-epson-multiprinter
-
-
-- name: setup hibernate lid switch
-  when: ('drv-lid-switch' | application_allowed(group_names, allowed_applications))
-  include_role:
-    name: drv-lid-switch
-
-## system setup 
-- name: setup swapfile hosts
-  when: ('swapfile' | application_allowed(group_names, allowed_applications))
-  include_role:
-    name: maint-swapfile
+    label: "{{ item }}-roles.yml"

tasks/stages/02_personal-computer.yml

@@ -0,0 +1,16 @@
+---
+- name: "setup docker role includes for desktop pc"
+  include_tasks: "./tasks/groups/{{ item }}-roles.yml"
+  loop:
+    - util-srv  # Services need to run before applications
+    - util-desk
+  loop_control:
+    label: "{{ item }}-roles.yml"
+
+- name: general host setup
+  when: ("personal_computers" in group_names)
+  include_role:
+    name: "{{ item }}"
+  loop:
+    - util-gen-admin
+    - drv-non-free

tasks/stages/02_server.yml

@@ -1,5 +1,5 @@
 ---
-- name: servers host setup
+- name: Setup server base
   when: ("servers" in group_names)
   include_role:
     name: "{{ item }}"
@@ -11,10 +11,10 @@
     - mon-bot-btrfs
     - maint-btrfs-auto-balancer
 
-- name: "Integrate Docker Server Roles"
+- name: "Include server roles"
   include_tasks: "./tasks/groups/{{ item }}-roles.yml"
   loop:
-    - svc
-    - web
+    - web-svc # Services need to run before applications
+    - web-app
   loop_control:
     label: "{{ item }}-roles.yml"

tasks/stages/03_destructor.yml

@@ -0,0 +1,6 @@
+- name: "Load destruction roles"
+  include_tasks: "./tasks/groups/{{ item }}-roles.yml"
+  loop:
+    - cln
+  loop_control:
+    label: "{{ item }}-roles.yml"