From fd8ef26b5318c3ccd6b6807975c2ab0fbdd00923 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 17 Jul 2025 09:47:08 +0200 Subject: [PATCH] Solved streaming bugs --- roles/web-app-mastodon/tasks/main.yml | 2 +- roles/web-app-mastodon/templates/env.j2 | 2 +- roles/web-app-mastodon/vars/main.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/web-app-mastodon/tasks/main.yml b/roles/web-app-mastodon/tasks/main.yml index fa313ce4..7a0d83e9 100644 --- a/roles/web-app-mastodon/tasks/main.yml +++ b/roles/web-app-mastodon/tasks/main.yml @@ -6,7 +6,7 @@ - name: "Include setup for domain '{{ domain }}'" include_role: name: srv-proxy-6-6-domain - loop: "{{ domains.mastodon }}" + loop: "{{ domains['web-app-mastodon'] }}" loop_control: loop_var: domain vars: diff --git a/roles/web-app-mastodon/templates/env.j2 b/roles/web-app-mastodon/templates/env.j2 index 9eeb08cc..f565a854 100644 --- a/roles/web-app-mastodon/templates/env.j2 +++ b/roles/web-app-mastodon/templates/env.j2 @@ -4,7 +4,7 @@ LOCAL_DOMAIN={{domains | get_domain(application_id)}} -ALTERNATE_DOMAINS="{{ domains.mastodon[1:] | join(',') }}" +ALTERNATE_DOMAINS="{{ domains['web-app-mastodon'][1:] | join(',') }}" SINGLE_USER_MODE={{ applications | get_app_conf(application_id, 'single_user_mode', True) }} # Credentials diff --git a/roles/web-app-mastodon/vars/main.yml b/roles/web-app-mastodon/vars/main.yml index 122fefb0..e81481b5 100644 --- a/roles/web-app-mastodon/vars/main.yml +++ b/roles/web-app-mastodon/vars/main.yml @@ -4,8 +4,8 @@ mastodon_version: "{{ applications | get_app_conf(application_id, 'd mastodon_image: "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.image', True) }}" mastodon_name: "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.name', True) }}" mastodon_volume: "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}" -mastodon_streaming_version: "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.version', True) }}" -mastodon_streaming_image: "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.image', True) }}" -mastodon_streaming_name: "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.name', True) }}_streaming" +mastodon_streaming_version: "{{ applications | get_app_conf(application_id, 'docker.services.streaming.version', True) }}" +mastodon_streaming_image: "{{ applications | get_app_conf(application_id, 'docker.services.streaming.image', True) }}" +mastodon_streaming_name: "{{ applications | get_app_conf(application_id, 'docker.services.streaming.name', True) }}_streaming" mastodon_sidekiq_name: "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.name', True) }}_sidekiq" mastodon_setup: "{{ applications | get_app_conf(application_id, 'setup', True) }}" \ No newline at end of file