Restructure and cleaned up in preparation of new backup logic

This commit is contained in:
2025-07-15 23:51:51 +02:00
parent c8054ffbc3
commit af3ea9039c
106 changed files with 703 additions and 429 deletions

View File

@@ -33,8 +33,13 @@ excluded_ips: "{{ networks.internet.values() | list }}"
docker:
services:
matomo:
image: "matomo:latest"
image: "matomo"
version: "latest"
name: "matomo"
no_stop_required: true
database:
enabled: true
redis:
enabled: false
enabled: false
volumes:
data: matomo_data

View File

@@ -2,7 +2,7 @@
application:
{% set container_port = 80 %}
{% include 'roles/docker-container/templates/base.yml.j2' %}
image: "{{ applications | get_app_conf(application_id, 'docker.services.matomo.image', True) }}"
image: "{{ matomo_image }}:{{ matomo_version }}"
ports:
- "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
volumes:
@@ -12,5 +12,6 @@
{% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
data:
name: {{ matomo_data }}
{% include 'roles/docker-compose/templates/networks.yml.j2' %}

View File

@@ -4,7 +4,9 @@ database_type: "mariadb"
matomo_excluded_ips: "{{ applications | get_app_conf(application_id, 'excluded_ips', True) }}"
matomo_index_php_url: "{{ domains | get_url(application_id, web_protocol) }}/index.php"
matomo_auth_token: "{{ applications | get_app_conf(application_id, 'credentials.auth_token', True) }}"
matomo_version: "{{ applications | get_app_conf(application_id, 'docker.services.matomo.version', True) }}"
matomo_image: "{{ applications | get_app_conf(application_id, 'docker.services.matomo.image', True) }}"
matomo_data: "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
# I don't know if this is still necessary
domain: "{{ domains | get_domain(application_id) }}"