Solved collection dependency bug

2025-08-29 15:06:26 +02:00 · 2025-07-12 13:42:45 +02:00
parent b2e32aacf3
commit e174523fc6
52 changed files with 148 additions and 69 deletions
--- a/roles/desk-bluray-player/vars/main.yml
+++ b/roles/desk-bluray-player/vars/main.yml
@@ -1 +1 @@
-application_id: bluray-player
+application_id: desk-bluray-player
--- a/roles/desk-chromium/vars/main.yml
+++ b/roles/desk-chromium/vars/main.yml
@@ -1,5 +1,5 @@
 ---

-application_id:   "chromium"
+application_id:   "desk-chromium"

 chromium_package: "{{ 'chromium-browser' if ansible_os_family == 'Debian' else 'chromium' }}"
--- a/roles/desk-firefox/vars/main.yml
+++ b/roles/desk-firefox/vars/main.yml
@@ -1,7 +1,7 @@
 ---
 # Default variables for the pc-firefox role

-application_id: "firefox"
+application_id: "desk-firefox"

 # Package name for Firefox on Arch Linux
 firefox_package: firefox
--- a/roles/desk-gnome-caffeine/vars/main.yml
+++ b/roles/desk-gnome-caffeine/vars/main.yml
@@ -1,2 +1,2 @@
 auto_start_directory: /home/{{users.client.username}}/.config/autostart/
-application_id: gnome-caffeine
+application_id: desk-gnome-caffeine
--- a/roles/desk-gnome-extensions/vars/main.yml
+++ b/roles/desk-gnome-extensions/vars/main.yml
@@ -1 +1 @@
-application_id: gnome-extensions
+application_id: desk-gnome-extensions
--- a/roles/desk-gnome-terminal/vars/main.yml
+++ b/roles/desk-gnome-terminal/vars/main.yml
@@ -1 +1 @@
-application_id: gnome-terminal
+application_id: desk-gnome-terminal
--- a/roles/desk-gnome/vars/main.yml
+++ b/roles/desk-gnome/vars/main.yml
@@ -1 +1 @@
-application_id: gnome
+application_id: desk-gnome
--- a/roles/desk-gnucash/vars/main.yml
+++ b/roles/desk-gnucash/vars/main.yml
@@ -1 +1 @@
-application_id: gnucash
+application_id: desk-gnucash
--- a/roles/desk-jrnl/vars/main.yml
+++ b/roles/desk-jrnl/vars/main.yml
@@ -1 +1 @@
-application_id: jrnl
+application_id: desk-jrnl
--- a/roles/desk-keepassxc/vars/main.yml
+++ b/roles/desk-keepassxc/vars/main.yml
@@ -1 +1 @@
-application_id: keepassxc
+application_id: desk-keepassxc
--- a/roles/desk-libreoffice/tasks/main.yml
+++ b/roles/desk-libreoffice/tasks/main.yml
@@ -2,11 +2,11 @@
  community.general.pacman:
    name:
      - ttf-liberation
-      - "libreoffice-{{ applications.libreoffice.flavor }}"
+      - "libreoffice-{{ applications['desk-libreoffice'].flavor }}"
    state: present

 - name: install libreoffice language packages
  community.general.pacman:
-    name: "libreoffice-{{ applications.libreoffice.flavor }}-{{ item }}"
+    name: "libreoffice-{{ applications['desk-libreoffice'].flavor }}-{{ item }}"
    state: present
  loop: "{{libreoffice_languages}}"
--- a/roles/desk-libreoffice/vars/main.yml
+++ b/roles/desk-libreoffice/vars/main.yml
@@ -1 +1 @@
-application_id: "libreoffice"
+application_id: "desk-libreoffice"
--- a/roles/desk-nextcloud-client/vars/main.yml
+++ b/roles/desk-nextcloud-client/vars/main.yml
@@ -1,3 +1,3 @@
 user_home_directory: /home/{{users.client.username}}/
 cloud_directory: '{{user_home_directory}}Clouds/{{cloud_fqdn}}/{{users.client.username}}/'
-application_id: nextcloud-client
+application_id: desk-nextcloud-client
--- a/roles/desk-obs/vars/main.yml
+++ b/roles/desk-obs/vars/main.yml
@@ -1 +1 @@
-application_id: obs
+application_id: desk-obs
--- a/roles/desk-qbittorrent/vars/main.yml
+++ b/roles/desk-qbittorrent/vars/main.yml
@@ -1 +1 @@
-application_id: qbittorrent
+application_id: desk-qbittorrent
--- a/roles/desk-retroarch/vars/main.yml
+++ b/roles/desk-retroarch/vars/main.yml
@@ -2,4 +2,4 @@ retroarch_packages:
 - retroarch
 - retroarch-assets-xmb
 - retroarch-assets-ozone
-application_id: retroarch
+application_id: desk-retroarch
--- a/roles/desk-spotify/vars/main.yml
+++ b/roles/desk-spotify/vars/main.yml
@@ -1 +1 @@
-application_id: spotify
+application_id: desk-spotify
--- a/roles/desk-ssh/vars/main.yml
+++ b/roles/desk-ssh/vars/main.yml
@@ -1 +1 @@
-application_id: ssh
+application_id: desk-ssh
--- a/roles/desk-torbrowser/vars/main.yml
+++ b/roles/desk-torbrowser/vars/main.yml
@@ -1 +1 @@
-application_id: torbrowser
+application_id: desk-torbrowser
--- a/roles/desk-virtual-box/vars/main.yml
+++ b/roles/desk-virtual-box/vars/main.yml
@@ -1 +1 @@
-application_id: virtual-box
+application_id: desk-virtual-box
--- a/roles/desk-zoom/vars/main.yml
+++ b/roles/desk-zoom/vars/main.yml
@@ -1 +1 @@
-application_id: zoom
+application_id: desk-zoom
--- a/roles/dev-java/vars/main.yml
+++ b/roles/dev-java/vars/main.yml
@@ -1 +1 @@
-application_id: java
+application_id: dev-java
--- a/roles/dev-make/vars/main.yml
+++ b/roles/dev-make/vars/main.yml
@@ -1 +1 @@
-application_id: make
+application_id: dev-make
--- a/roles/gen-hunspell/vars/main.yml
+++ b/roles/gen-hunspell/vars/main.yml
@@ -1 +1 @@
-application_id: hunspell
+application_id: gen-hunspell
--- a/roles/net-wireguard-core/vars/main.yml
+++ b/roles/net-wireguard-core/vars/main.yml
@@ -1 +1 @@
-application_id: wireguard-core
+application_id: net-wireguard-core
--- a/roles/net-wireguard-firewalled/vars/main.yml
+++ b/roles/net-wireguard-firewalled/vars/main.yml
@@ -1 +1 @@
-application_id: wireguard-firewalled
+application_id: net-wireguard-firewalled
--- a/roles/net-wireguard-plain/vars/main.yml
+++ b/roles/net-wireguard-plain/vars/main.yml
@@ -1 +1 @@
-application_id: wireguard-plain
+application_id: net-wireguard-plain
--- a/roles/util-desk-browser/vars/main.yml
+++ b/roles/util-desk-browser/vars/main.yml
@@ -1 +1 @@
-application_id: browser
+application_id: util-desk-browser
--- a/roles/util-desk-design/vars/main.yml
+++ b/roles/util-desk-design/vars/main.yml
@@ -1 +1 @@
-application_id: design
+application_id: util-desk-design
--- a/roles/util-desk-dev-arduino/vars/main.yml
+++ b/roles/util-desk-dev-arduino/vars/main.yml
@@ -1 +1 @@
-application_id: dev-arduino
+application_id: util-desk-dev-arduino
--- a/roles/util-desk-dev-core/vars/main.yml
+++ b/roles/util-desk-dev-core/vars/main.yml
@@ -1 +1 @@
-application_id: dev-core
+application_id: util-desk-dev-core
--- a/roles/util-desk-dev-java/vars/main.yml
+++ b/roles/util-desk-dev-java/vars/main.yml
@@ -1 +1 @@
-application_id: dev-java
+application_id: util-desk-dev-java
--- a/roles/util-desk-dev-php/vars/main.yml
+++ b/roles/util-desk-dev-php/vars/main.yml
@@ -1 +1 @@
-application_id: dev-php
+application_id: util-desk-dev-php
--- a/roles/util-desk-dev-python/vars/main.yml
+++ b/roles/util-desk-dev-python/vars/main.yml
@@ -1 +1 @@
-application_id: dev-python
+application_id: util-desk-dev-python
--- a/roles/util-desk-dev-shell/vars/main.yml
+++ b/roles/util-desk-dev-shell/vars/main.yml
@@ -1 +1 @@
-application_id: dev-shell
+application_id: util-desk-dev-shell
--- a/roles/util-desk-game-compose/vars/main.yml
+++ b/roles/util-desk-game-compose/vars/main.yml
@@ -1 +1 @@
-application_id: game-compose
+application_id: util-desk-game-compose
--- a/roles/util-desk-game-os/vars/main.yml
+++ b/roles/util-desk-game-os/vars/main.yml
@@ -5,4 +5,4 @@ gamer_default_games:
 - gnuchess
 - sauerbraten
 - mari0
-application_id: game-os
+application_id: util-desk-game-os
--- a/roles/util-desk-game-windows/vars/main.yml
+++ b/roles/util-desk-game-windows/vars/main.yml
@@ -1 +1 @@
-application_id: game-windows
+application_id: util-desk-game-windows
--- a/roles/util-desk-office-tools/vars/main.yml
+++ b/roles/util-desk-office-tools/vars/main.yml
@@ -1 +1 @@
-application_id: office-tools
+application_id: util-desk-office-tools
--- a/roles/util-dev-admin-network/vars/main.yml
+++ b/roles/util-dev-admin-network/vars/main.yml
@@ -1 +1 @@
-application_id: dev-admin-network
+application_id: util-dev-admin-network
--- a/roles/util-dev-admin/vars/main.yml
+++ b/roles/util-dev-admin/vars/main.yml
@@ -1 +1 @@
-application_id: dev-admin
+application_id: util-dev-admin
--- a/roles/util-srv-corporate-identity/vars/main.yml
+++ b/roles/util-srv-corporate-identity/vars/main.yml
@@ -1 +1 @@
-application_id: corporate-identity
+application_id: util-srv-corporate-identity
--- a/roles/web-app-portfolio/vars/main.yml
+++ b/roles/web-app-portfolio/vars/main.yml
@@ -1,4 +1,4 @@
-application_id:             "portfolio"
+application_id:             "web-app-portfolio"
 docker_repository_address:  "https://github.com/kevinveenbirkenbach/portfolio"
 config_inventory_path:      "{{ inventory_dir }}/files/{{ inventory_hostname }}/docker/portfolio/config.yaml.j2"
 docker_repository:          true
--- a/roles/web-svc-asset/vars/main.yml
+++ b/roles/web-svc-asset/vars/main.yml
@@ -1,3 +1,3 @@
-application_id:     "asset"                                         # Application identifier
+application_id:     "web-svc-asset"                                         # Application identifier
 source_directory:   "{{ applications[application_id].source_directory }}/"  # Source directory from which the files are coming from
 target_directory:   "{{ nginx.directories.data.files }}assets"              # Directory to which the files will be copied
--- a/roles/web-svc-file/config/main.yml
+++ b/roles/web-svc-file/config/main.yml
@@ -4,4 +4,6 @@ features:
  portfolio_iframe:   true
 domains:
  canonical:
+    - "file.{{ primary_domain }}"
+  alias:
    - "files.{{ primary_domain }}"
--- a/roles/web-svc-file/vars/main.yml
+++ b/roles/web-svc-file/vars/main.yml
@@ -1,2 +1,2 @@
-application_id: "file"
+application_id: "web-svc-file"
 domain:         "{{ domains | get_domain(application_id) }}"
--- a/roles/web-svc-html/vars/main.yml
+++ b/roles/web-svc-html/vars/main.yml
@@ -1,4 +1,2 @@
-application_id:       "html"
-domain:               "{{domains | get_domain(application_id)}}"
-features:
-  portfolio_iframe:   true  # Necessary for imprint loading
+application_id:       "web-svc-html"
+domain:               "{{domains | get_domain(application_id)}}"
--- a/roles/web-svc-legal/vars/main.yml
+++ b/roles/web-svc-legal/vars/main.yml
@@ -1 +1 @@
-application_id: "legal"
+application_id: "web-svc-legal"