From 0adeb60f470ced79faf50bdb6cc14ef18a54e6e3 Mon Sep 17 00:00:00 2001
From: "Antonio J. Delgado" <ad@susurrando.com>
Date: Sun, 9 Jul 2023 17:19:59 +0300
Subject: [PATCH] fix env for postgresql

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

diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 2a1890b..2f79e5e 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -11,8 +11,7 @@ services:
       test: ['CMD', 'pg_isready', '-U', 'postgres']
     volumes:
       - ./postgres14:/var/lib/postgresql/data
-    environment:
-      - 'POSTGRES_HOST_AUTH_METHOD=trust'
+    env_file: .env.production
 
   tor:
     image: sirboops/tor
diff --git a/templates/env.j2 b/templates/env.j2
index d93fb42..6e7cdcf 100644
--- a/templates/env.j2
+++ b/templates/env.j2
@@ -49,6 +49,7 @@ VAPID_PUBLIC_KEY=
 POSTGRES_USER={{ mastodon_db_user }}
 POSTGRES_DB={{ mastodon_db }}_{{ mastodon_environment }}
 POSTGRES_PASSWORD={{ mastodon_db_password }}
+# POSTGRES_HOST_AUTH_METHOD=trust
 
 # pgbouncer configuration
 #POOL_MODE=transaction