kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-04-20 07:02:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed list bug

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-04-15 13:32:38 +02:00
parent cf44cb59b3
commit b5dc999584
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
group_vars/all/03_domains.yml
View File

@ -23,7 +23,8 @@ defaults_domains:
mailu: "mail.{{primary_domain}}" mailu: "mail.{{primary_domain}}"
mastodon: "microblog.{{primary_domain}}" mastodon: "microblog.{{primary_domain}}"
# ATTENTION: Will be owerwritten by the values in domains. Not merged. # ATTENTION: Will be owerwritten by the values in domains. Not merged.
mastodon_alternates: ["mastodon.{{primary_domain}}"] mastodon_alternates:
- "mastodon.{{primary_domain}}"
matomo: "matomo.{{primary_domain}}" matomo: "matomo.{{primary_domain}}"
matrix_synapse: "matrix.{{primary_domain}}" matrix_synapse: "matrix.{{primary_domain}}"
matrix_element: "element.{{primary_domain}}" matrix_element: "element.{{primary_domain}}"
@ -47,7 +48,6 @@ defaults_domains:
yourls: "s.{{primary_domain}}" yourls: "s.{{primary_domain}}"
# ATTENTION: Will be owerwritten by the values in domains. Not merged. # ATTENTION: Will be owerwritten by the values in domains. Not merged.
wordpress: wordpress:
- "wordpress.{{primary_domain}}"
- "blog.{{primary_domain}}" - "blog.{{primary_domain}}"
## Domain Redirects ## Domain Redirects
@ -74,3 +74,4 @@ defaults_redirect_domain_mappings:
- { source: "snipe-it.{{primary_domain}}", target: "{{domains.snipe_it}}" } - { source: "snipe-it.{{primary_domain}}", target: "{{domains.snipe_it}}" }
- { source: "taiga.{{primary_domain}}", target: "{{domains.taiga}}" } - { source: "taiga.{{primary_domain}}", target: "{{domains.taiga}}" }
- { source: "videos.{{primary_domain}}", target: "{{domains.peertube}}" } - { source: "videos.{{primary_domain}}", target: "{{domains.peertube}}" }
- { source: "wordpress.{{primary_domain}}", target: "{{domains.wordpress}}" }

10
roles/docker-portfolio/lookup_plugins/docker_cards.py
View File

@ -85,10 +85,18 @@ class LookupModule(LookupBase):
except Exception as e: except Exception as e:
raise AnsibleError("Error reading '{}': {}".format(meta_path, str(e))) raise AnsibleError("Error reading '{}': {}".format(meta_path, str(e)))
# Build URL and retrieve iframe flag # Retrieve domains and applications from the variables
domains = variables.get("domains", {}) domains = variables.get("domains", {})
applications = variables.get("applications", {}) applications = variables.get("applications", {})
domain_url = domains.get(application_id, "") domain_url = domains.get(application_id, "")
# Check if domain_url is a list. If so, select the first element.
if isinstance(domain_url, list):
domain_url = domain_url[0]
else:
domain_url = ""
# Construct the URL using the domain_url if available.
url = "https://" + domain_url if domain_url else "" url = "https://" + domain_url if domain_url else ""
app_data = applications.get(application_id, {}) app_data = applications.get(application_id, {})