From 6e1e1ad5c5d27035b3f16b15c134a4bfaca04f83 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Wed, 27 Aug 2025 18:11:31 +0200
Subject: [PATCH] Renamed pixelfed parameter

---
 .../templates/docker-compose.yml.j2               | 10 +++++-----
 roles/web-app-pixelfed/templates/env.j2           |  2 +-
 roles/web-app-pixelfed/vars/main.yml              | 15 +++++++++------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/roles/web-app-pixelfed/templates/docker-compose.yml.j2 b/roles/web-app-pixelfed/templates/docker-compose.yml.j2
index 635752a1..dd6821bd 100644
--- a/roles/web-app-pixelfed/templates/docker-compose.yml.j2
+++ b/roles/web-app-pixelfed/templates/docker-compose.yml.j2
@@ -1,8 +1,8 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
 
   application:
-    image: "{{ pixelfed_image }}:{{ pixelfed_version }}"
-    container_name: {{ pixelfed_name }}
+    image: "{{ PIXELFED_IMAGE }}:{{ PIXELFED_VERSION }}"
+    container_name: {{ PIXELFED_CONTAINER }}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     volumes:
       - "data:/var/www/storage"
@@ -12,8 +12,8 @@
 {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
   worker:
-    container_name: {{ pixelfed_worker_name }}
-    image: "{{ pixelfed_image }}:{{ pixelfed_version }}"
+    container_name: {{ PIXELFED_WORKER_CONTAINER }}
+    image: "{{ PIXELFED_IMAGE }}:{{ PIXELFED_VERSION }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     volumes:
       - "data:/var/www/storage"
@@ -31,6 +31,6 @@
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
-    name: {{ pixelfed_volume }}
+    name: {{ PIXELFED_VOLUME }}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/web-app-pixelfed/templates/env.j2 b/roles/web-app-pixelfed/templates/env.j2
index a9bc0a3d..7c3a8c3c 100644
--- a/roles/web-app-pixelfed/templates/env.j2
+++ b/roles/web-app-pixelfed/templates/env.j2
@@ -2,7 +2,7 @@
 APP_KEY={{applications | get_app_conf(application_id, 'credentials.app_key', True)}}
 
 ## General Settings
-APP_NAME="{{ pixelfed_titel }}"
+APP_NAME="{{ PIXELFED_TITEL }}"
 APP_ENV={{ ENVIRONMENT | lower }}
 APP_DEBUG={{MODE_DEBUG | string | lower }}
 APP_URL={{ domains | get_url(application_id, WEB_PROTOCOL) }}
diff --git a/roles/web-app-pixelfed/vars/main.yml b/roles/web-app-pixelfed/vars/main.yml
index 430ae326..623af7a5 100644
--- a/roles/web-app-pixelfed/vars/main.yml
+++ b/roles/web-app-pixelfed/vars/main.yml
@@ -1,9 +1,12 @@
+# General
 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.volumes.data', True) }}"
-pixelfed_titel:             "{{ applications | get_app_conf(application_id, 'titel', True) }}"
+
+# Pixelfed
+PIXELFED_VERSION:           "{{ applications | get_app_conf(application_id, 'docker.services.pixelfed.version') }}"
+PIXELFED_IMAGE:             "{{ applications | get_app_conf(application_id, 'docker.services.pixelfed.image') }}"
+PIXELFED_CONTAINER:         "{{ applications | get_app_conf(application_id, 'docker.services.pixelfed.name') }}"
+PIXELFED_WORKER_CONTAINER:  "{{ applications | get_app_conf(application_id, 'docker.services.worker.name') }}"
+PIXELFED_VOLUME:            "{{ applications | get_app_conf(application_id, 'docker.volumes.data') }}"
+PIXELFED_TITEL:             "{{ applications | get_app_conf(application_id, 'titel') }}"