From 812d8ff158bb3e03793d26a9b6c01d2ceb24193f Mon Sep 17 00:00:00 2001
From: Mike Holloway <mike.holloway@protonmail.com>
Date: Tue, 9 Dec 2025 19:06:41 -0500
Subject: [PATCH] app,db - env variables for automated install

---
 templates/db.env.j2             | 1 +
 templates/docker-compose.yml.j2 | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/db.env.j2 b/templates/db.env.j2
index 45f321a..c918ac9 100644
--- a/templates/db.env.j2
+++ b/templates/db.env.j2
@@ -1,3 +1,4 @@
+POSTGRES_USER="nextcloud"
 POSTGRES_PASSWORD=
 NEXTCLOUD_ADMIN_USER="admin"
 NEXTCLOUD_ADMIN_PASSWORD=
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 92f02ec..120d0ba 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -6,6 +6,8 @@ services:
     restart: always
     volumes:
       - db:/var/lib/postgresql/data:Z
+    environment:
+      - POSTGRES_DB=nextcloud
     env_file:
       - .db.env
     networks:
@@ -24,10 +26,10 @@ services:
     volumes:
       - /home/{{ user.name }}/webroot:/var/www/html
     environment:
-      - NEXTCLOUD_ADMIN_USER=admin
-      - POSTGRES_DATABASE=nextcloud
+      - POSTGRES_DB=nextcloud
       - POSTGRES_HOST=db:5432
       - REDIS_HOST=redis
+      - NEXTCLOUD_ADMIN_USER=admin
       - NEXTCLOUD_TRUSTED_DOMAINS={{ inventory_hostname | default('ansible_undefined_variable')}}
     env_file:
       - .db.env