kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-08-15 16:40:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Solved missing redirect bug

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-08-08 11:03:43 +02:00
parent 9f865dd215
commit eedfe83ece
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/sys-hlth-webserver/templates/sys-hlth-webserver.py.j2
View File

@ -42,7 +42,7 @@ for filename in os.listdir(config_path):
# Prepare the URL and expected status codes # Prepare the URL and expected status codes
url = f"{{ WEB_PROTOCOL }}://{domain}" url = f"{{ WEB_PROTOCOL }}://{domain}"
redirected_domains = [domain['source'] for domain in {{ current_play_domain_mappings_redirect}}] redirected_domains = [domain['source'] for domain in {{ redirect_domain_mappings }}]
redirected_domains.append("{{domains | get_domain('web-app-mailu')}}") redirected_domains.append("{{domains | get_domain('web-app-mailu')}}")
expected_statuses = get_expected_statuses(domain, parts, redirected_domains) expected_statuses = get_expected_statuses(domain, parts, redirected_domains)

3
roles/web-app-friendica/vars/main.yml
View File

@ -1,5 +1,8 @@
# General
application_id: "web-app-friendica" application_id: "web-app-friendica"
database_type: "mariadb" database_type: "mariadb"
# Friendica Specific
friendica_container: "friendica" friendica_container: "friendica"
friendica_no_validation: "{{ applications | get_app_conf(application_id, 'features.oidc', True) }}" # Email validation is not neccessary if OIDC is active friendica_no_validation: "{{ applications | get_app_conf(application_id, 'features.oidc', True) }}" # Email validation is not neccessary if OIDC is active
friendica_application_base: "/var/www/html" friendica_application_base: "/var/www/html"

5
tasks/stages/01_constructor.yml
View File

@ -42,7 +42,6 @@
canonical_domains_map(primary_domain) | canonical_domains_map(primary_domain) |
combine(current_play_domains, recursive=True) combine(current_play_domains, recursive=True)
}} }}
- name: Merge redirect_domain_mappings - name: Merge redirect_domain_mappings
set_fact: set_fact:
# The following mapping is necessary to define the exceptions for domains which are created, but which aren't used # The following mapping is necessary to define the exceptions for domains which are created, but which aren't used
@ -54,7 +53,7 @@
- name: Set current play redirect domain mappings - name: Set current play redirect domain mappings
set_fact: set_fact:
current_play_domain_mappings_redirect: >- redirect_domain_mappings: >-
{{ {{
current_play_applications | current_play_applications |
domain_mappings(primary_domain) | domain_mappings(primary_domain) |
@ -67,7 +66,7 @@
{{ {{
(current_play_domains | (current_play_domains |
combine( combine(
current_play_domain_mappings_redirect | redirect_domain_mappings | default([]) |
items2dict(key_name='source', value_name='source'), items2dict(key_name='source', value_name='source'),
recursive=True recursive=True
)) | )) |