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

Finalized matomo integration into new architecture

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-07-17 12:09:20 +02:00
parent fd8ef26b53
commit 9469452275
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/web-app-mastodon/config/main.yml
View File

@ -28,5 +28,6 @@ docker:
streaming: streaming:
image: "ghcr.io/mastodon/mastodon-streaming" image: "ghcr.io/mastodon/mastodon-streaming"
version: latest version: latest
name: "mastodon-streaming"
volumes: volumes:
data: "mastodon_data" data: "mastodon_data"

7
roles/web-app-mastodon/templates/docker-compose.yml.j2
View File

@ -24,7 +24,7 @@
command: node ./streaming command: node ./streaming
{% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %} {% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %}
ports: ports:
- "127.0.0.1:{{ports.localhost.websocket[application_id]}}:{{ container_port }}" - "127.0.0.1:{{ ports.localhost.websocket[application_id] }}:{{ container_port }}"
{% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %} {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
{% include 'roles/docker-container/templates/networks.yml.j2' %} {% include 'roles/docker-container/templates/networks.yml.j2' %}
@ -37,7 +37,10 @@
volumes: volumes:
- data:/mastodon/public/system - data:/mastodon/public/system
healthcheck: healthcheck:
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"] test: ["CMD-SHELL", "pgrep -f sidekiq || exit 1"]
interval: 1m
timeout: 10s
retries: 3
{% include 'roles/docker-container/templates/networks.yml.j2' %} {% include 'roles/docker-container/templates/networks.yml.j2' %}
{% include 'roles/docker-compose/templates/volumes.yml.j2' %} {% include 'roles/docker-compose/templates/volumes.yml.j2' %}

2
roles/web-app-mastodon/vars/main.yml
View File

@ -6,6 +6,6 @@ mastodon_name: "{{ applications | get_app_conf(application_id, 'd
mastodon_volume: "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}" mastodon_volume: "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
mastodon_streaming_version: "{{ applications | get_app_conf(application_id, 'docker.services.streaming.version', True) }}" 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_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_streaming_name: "{{ applications | get_app_conf(application_id, 'docker.services.streaming.name', True) }}"
mastodon_sidekiq_name: "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.name', True) }}_sidekiq" 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) }}" mastodon_setup: "{{ applications | get_app_conf(application_id, 'setup', True) }}"