mastodon passwords WIP

dockers/mastodon/docker-compose.yml

@@ -13,8 +13,10 @@ services:
       test: ['CMD', 'pg_isready', '-U', 'postgres']
     volumes:
       - postgres:/var/lib/postgresql/data
-    environment:
-      - 'POSTGRES_HOST_AUTH_METHOD=trust'
+    # environment:
+    #   - 'POSTGRES_HOST_AUTH_METHOD=trust'
+    env_file:
+      - ../../secret/env-mastodonDB
 
   redis:
     container_name: ${mastodonRedisName}
@@ -72,6 +74,7 @@ services:
     env_file:
       - env-config
       - ../../secret/env-mastodonServ
+      - ../../secret/env-mastodonDB
     command: bundle exec puma -C config/puma.rb
     networks:
       - mastodonNet

dockers/mastodon/env-config

@@ -24,9 +24,9 @@ REDIS_PORT=
 # PostgreSQL
 # ----------
 DB_HOST=db
-DB_USER=postgres
-DB_NAME=postgres
-DB_PASS=
+#DB_USER=postgres
+#DB_NAME=postgres
+#DB_PASS=
 DB_PORT=5432
 
 # Elasticsearch (optional)