From 5580f40edac95885923566e408d863c8cfeb5e03 Mon Sep 17 00:00:00 2001
From: Oscar <oscgonfer@gmail.com>
Date: Wed, 24 Jan 2024 17:11:30 +0000
Subject: [PATCH] A few docker-compose and env tweaks to bring up the new-api
 server

---
 compose/db.yml                              | 3 ++-
 env.example                                 | 3 +++
 scripts/nginx-conf/api.smartcitizen.me.conf | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compose/db.yml b/compose/db.yml
index 20c03923..1f67828a 100644
--- a/compose/db.yml
+++ b/compose/db.yml
@@ -3,9 +3,10 @@ services:
     image: postgres:10
     volumes:
       - sck-postgres:/var/lib/postgresql/data
+    env_file: ../.env
    #environment:
       # NOTE: Postgres 9.5 stopped allowing connections without passwords.
       # Enable this if needed.
      #- POSTGRES_HOST_AUTH_METHOD=trust
 volumes:
-  sck-postgres:
\ No newline at end of file
+  sck-postgres:
diff --git a/env.example b/env.example
index 2d805874..8aedbfd1 100644
--- a/env.example
+++ b/env.example
@@ -33,3 +33,6 @@ kairos_http_password=some_password
 
 # AUTH ID
 AUTH_SECRET_KEY_BASE=CreateSomeVeryLongLongLongRandomStringHere
+
+# Postgres password (needs to be the same as in the DATABASE_URL above)
+POSTGRES_PASSWORD=postgres
diff --git a/scripts/nginx-conf/api.smartcitizen.me.conf b/scripts/nginx-conf/api.smartcitizen.me.conf
index 3c0bcd87..a1371d0d 100644
--- a/scripts/nginx-conf/api.smartcitizen.me.conf
+++ b/scripts/nginx-conf/api.smartcitizen.me.conf
@@ -72,7 +72,7 @@ server {
 }
 
 server {
-  server_name api.smartcitizen.me data.smartcitizen.me staging-api.smartcitizen.me staging-data.smartcitizen.me;
+  server_name api.smartcitizen.me data.smartcitizen.me staging-api.smartcitizen.me staging-data.smartcitizen.me new-api.smartcitizen.me;
 
   listen   80;
   listen   [::]:80;