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

@@ -1,7 +1,4 @@
titel: "Pictures on {{primary_domain}}"
#version: "latest"
images:
pixelfed: "zknt/pixelfed:latest"
features:
matomo: true
css: false # Needs to be reactivated
@@ -28,4 +25,13 @@ docker:
redis:
enabled: true
database:
enabled: true
enabled: true
pixelfed:
image: "zknt/pixelfed"
version: "latest"
name: "pixelfed"
no_stop_required: true
worker:
name: "pixelfed_worker"
volumes:
data: "pixelfed_data"

View File

@@ -1,7 +1,8 @@
{% include 'roles/docker-compose/templates/base.yml.j2' %}
application:
image: "{{ applications | get_app_conf(application_id, 'images.pixelfed', True) }}"
image: "{{ pixelfed_image }}:{{ pixelfed_version }}"
container_name: {{ pixelfed_name }}
{% include 'roles/docker-container/templates/base.yml.j2' %}
volumes:
- "data:/var/www/storage"
@@ -11,7 +12,8 @@
{% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
{% include 'roles/docker-container/templates/networks.yml.j2' %}
worker:
image: "{{ applications | get_app_conf(application_id, 'images.pixelfed', True) }}"
container_name: {{ pixelfed_worker_name }}
image: "{{ pixelfed_image }}:{{ pixelfed_version }}"
{% include 'roles/docker-container/templates/base.yml.j2' %}
volumes:
- "data:/var/www/storage"
@@ -30,5 +32,6 @@
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
redis:
data:
name: {{ pixelfed_volume }}
{% include 'roles/docker-compose/templates/networks.yml.j2' %}

View File

@@ -1,3 +1,8 @@
application_id: "pixelfed"
proxy_extra_configuration: "client_max_body_size 512M;"
database_type: "mariadb"
application_id: "web-app-pixelfed"
proxy_extra_configuration: "client_max_body_size 512M;"
database_type: "mariadb"
pixelfed_version: "{{ applications | get_app_conf(application_id, 'docker.services.pixelfed.version', True) }}"
pixelfed_image: "{{ applications | get_app_conf(application_id, 'docker.services.pixelfed.image', True) }}"
pixelfed_name: "{{ applications | get_app_conf(application_id, 'docker.services.pixelfed.name', True) }}"
pixelfed_worker_name: "{{ applications | get_app_conf(application_id, 'docker.services.worker.name', True) }}"
pixelfed_volume: "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"