From c96833988a19b9854f02157e5f8c62df2e3794be Mon Sep 17 00:00:00 2001
From: Marty Oehme <contact@martyoeh.me>
Date: Sat, 19 Jul 2025 12:37:43 +0200
Subject: [PATCH 1/3] roles: Change main service name to app

---
 roles/caddy/templates/compose.yaml.jinja     |  2 +-
 roles/grocy/templates/compose.yaml.jinja     |  2 +-
 roles/paperless/templates/compose.yaml.jinja | 17 +++++++----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/roles/caddy/templates/compose.yaml.jinja b/roles/caddy/templates/compose.yaml.jinja
index 10ca38b..9743176 100644
--- a/roles/caddy/templates/compose.yaml.jinja
+++ b/roles/caddy/templates/compose.yaml.jinja
@@ -1,5 +1,5 @@
 services:
-  caddy:
+  app:
     image: lucaslorentz/caddy-docker-proxy:ci-alpine
     ports:
       - 80:80
diff --git a/roles/grocy/templates/compose.yaml.jinja b/roles/grocy/templates/compose.yaml.jinja
index 8b75bd6..6a6e58c 100644
--- a/roles/grocy/templates/compose.yaml.jinja
+++ b/roles/grocy/templates/compose.yaml.jinja
@@ -1,5 +1,5 @@
 services:
-  grocy:
+  app:
     container_name: grocy
     image: lscr.io/linuxserver/grocy:latest
     networks:
diff --git a/roles/paperless/templates/compose.yaml.jinja b/roles/paperless/templates/compose.yaml.jinja
index 06dc145..c9c161f 100644
--- a/roles/paperless/templates/compose.yaml.jinja
+++ b/roles/paperless/templates/compose.yaml.jinja
@@ -1,6 +1,5 @@
 services:
-  paperless:
-    container_name: paperless
+  app:
     image: ghcr.io/paperless-ngx/paperless-ngx:latest
     restart: unless-stopped
     networks:
@@ -9,8 +8,8 @@ services:
     security_opt:
       - no-new-privileges:true
     depends_on:
-      - paperless-redis
-      - paperless-postgres
+      - redis
+      - postgres
     volumes:
       - "{{ stack_paperless_env_dir }}/data/paperless:/usr/src/paperless/data" # container data
       - "{{ stack_paperless_env_dir }}/data/paperless_export:/usr/src/paperless/export" # backup location
@@ -24,8 +23,8 @@ services:
       - "PAPERLESS_OCR_LANGUAGES={{ stack_paperless_ocr_languages }}"
       - "PAPERLESS_OCR_SKIP_ARCHIVE_FILE={{ stack_paperless_ocr_skip_archive_file }}"
       - "PAPERLESS_ENABLE_UPDATE_CHECK={{ stack_paperless_enable_update_check }}"
-      - "PAPERLESS_REDIS=redis://paperless-redis:6379"
-      - "PAPERLESS_DBHOST=paperless-postgres"
+      - "PAPERLESS_REDIS=redis://redis:6379"
+      - "PAPERLESS_DBHOST=postgres
       - "PAPERLESS_DBNAME={{ stack_paperless_dbname }}"
       - "PAPERLESS_DBUSER={{ stack_paperless_dbuser }}"
       - "PAPERLESS_DBPASS={{ stack_paperless_dbpass }}"
@@ -37,8 +36,7 @@ services:
       caddy: "{{ stack_paperless_subdomain }}"
       caddy.reverse_proxy: "{{ '{{' }}upstreams 8000{{ '}}'}}"
 
-  paperless-postgres:
-    container_name: paperless-postgres
+  postgres:
     image: postgres:16.0-alpine #fixedVersion
     restart: unless-stopped
     networks:
@@ -52,8 +50,7 @@ services:
       POSTGRES_USER: "{{ stack_paperless_dbuser }}"
       POSTGRES_PASSWORD: "{{ stack_paperless_dbpass }}"
 
-  paperless-redis:
-    container_name: paperless-redis
+  redis:
     image: redis:7.2-alpine #fixedVersion
     restart: unless-stopped
     networks:

From 03316733f58d8f40e53c8f001c412236dce17e2c Mon Sep 17 00:00:00 2001
From: Marty Oehme <contact@martyoeh.me>
Date: Mon, 21 Jul 2025 15:00:49 +0200
Subject: [PATCH 2/3] paperless: Fix compose missing quote

---
 roles/paperless/templates/compose.yaml.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/paperless/templates/compose.yaml.jinja b/roles/paperless/templates/compose.yaml.jinja
index c9c161f..2777370 100644
--- a/roles/paperless/templates/compose.yaml.jinja
+++ b/roles/paperless/templates/compose.yaml.jinja
@@ -24,7 +24,7 @@ services:
       - "PAPERLESS_OCR_SKIP_ARCHIVE_FILE={{ stack_paperless_ocr_skip_archive_file }}"
       - "PAPERLESS_ENABLE_UPDATE_CHECK={{ stack_paperless_enable_update_check }}"
       - "PAPERLESS_REDIS=redis://redis:6379"
-      - "PAPERLESS_DBHOST=postgres
+      - "PAPERLESS_DBHOST=postgres"
       - "PAPERLESS_DBNAME={{ stack_paperless_dbname }}"
       - "PAPERLESS_DBUSER={{ stack_paperless_dbuser }}"
       - "PAPERLESS_DBPASS={{ stack_paperless_dbpass }}"

From 40670b8953c25725a4974c316c09c1c9b8c2113a Mon Sep 17 00:00:00 2001
From: Marty Oehme <contact@martyoeh.me>
Date: Mon, 21 Jul 2025 15:02:58 +0200
Subject: [PATCH 3/3] site: Set up restic role directly after caddy role

---
 site.yaml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/site.yaml b/site.yaml
index eb20d2e..bf4e33f 100644
--- a/site.yaml
+++ b/site.yaml
@@ -59,6 +59,10 @@
         name: caddy
       tags: caddy
 
+    - name: Set up Restic stack
+      ansible.builtin.import_role:
+        name: restic
+
     - name: Set up Arr stack
       ansible.builtin.import_role:
         name: arr
@@ -73,8 +77,3 @@
       ansible.builtin.import_role:
         name: grocy
       tags: grocy
-
-    - name: Set up Restic stack
-      ansible.builtin.import_role:
-        name: restic
-      tags: restic