themepark: simplify plugin labels in roles

saltyorg · Mar 17, 2024 · 816c15c · 816c15c
1 parent aacbbbb
commit 816c15c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/inventories/group_vars/all.yml b/inventories/group_vars/all.yml
@@ -329,6 +329,13 @@ traefik_url: "{{ 'https://'
               if (lookup('vars', traefik_role_var + '_web_subdomain', default=lookup('vars', role_name + '_web_subdomain', default='')) | length > 0)
               else lookup('vars', traefik_role_var + '_web_domain', default=lookup('vars', role_name + '_web_domain', default=''))) }}"
 
+traefik_themepark_labels:
+  - '{ "traefik.http.middlewares.themepark-{{ traefik_router }}.plugin.themepark.app": "{{ lookup("vars", traefik_role_var + "_themepark_app", default=role_name) }}" }'
+  - '{ "traefik.http.middlewares.themepark-{{ traefik_router }}.plugin.themepark.theme": "{{ lookup("vars", traefik_role_var + "_themepark_theme", default=lookup("vars", role_name + "_themepark_theme", default="")) }}" }'
+  - '{ "traefik.http.middlewares.themepark-{{ traefik_router }}.plugin.themepark.addons": "{{ (lookup("vars", traefik_role_var + "_themepark_addons", default=lookup("vars", role_name + "_themepark_addons", default="")) | join(","))
+                                                                                           if lookup("vars", traefik_role_var + "_themepark_addons", default=lookup("vars", role_name + "_themepark_addons", default="")) | length > 0
+                                                                                           else omit }}" }'
+
 ################################
 # Docker
 ################################

diff --git a/roles/readarr/defaults/main.yml b/roles/readarr/defaults/main.yml
@@ -77,6 +77,7 @@ readarr_api_key:
 
 # Options can be found at https://github.com/themepark-dev/theme.park
 readarr_themepark_enabled: false
+readarr_themepark_app: "readarr"
 readarr_themepark_theme: "{{ global_themepark_theme }}"
 readarr_themepark_domain: "{{ global_themepark_domain }}"
 readarr_themepark_addons: ""
@@ -141,15 +142,9 @@ readarr_docker_hosts: "{{ docker_hosts_common
 # Labels
 readarr_docker_labels_default: {}
 readarr_docker_labels_custom: {}
-readarr_docker_labels_themepark:
-  - '{ "traefik.http.middlewares.themepark-{{ lookup("vars", readarr_name + "_name", default=readarr_name) }}.plugin.themepark.app": "readarr" }'
-  - '{ "traefik.http.middlewares.themepark-{{ lookup("vars", readarr_name + "_name", default=readarr_name) }}.plugin.themepark.theme": "{{ lookup("vars", readarr_name + "_themepark_theme", default=readarr_themepark_theme) }}" }'
-  - '{ "traefik.http.middlewares.themepark-{{ lookup("vars", readarr_name + "_name", default=readarr_name) }}.plugin.themepark.addons": "{{ (lookup("vars", readarr_name + "_themepark_addons", default=readarr_themepark_addons) | join(","))
-                                                                                                                                         if lookup("vars", readarr_name + "_themepark_addons", default=readarr_themepark_addons) | length > 0
-                                                                                                                                         else omit }}" }'
 readarr_docker_labels: "{{ docker_labels_common
                            | combine(lookup('vars', readarr_name + '_docker_labels_default', default=readarr_docker_labels_default))
-                           | combine((lookup('vars', readarr_name + '_docker_labels_themepark', default=readarr_docker_labels_themepark)
+                           | combine((traefik_themepark_labels
                                      if (readarr_themepark_enabled and global_themepark_plugin_enabled)
                                      else {}),
                                      lookup('vars', readarr_name + '_docker_labels_custom', default=readarr_docker_labels_custom)) }}"