Postgres bug fixes (#33)

* Setup ssl for postgres * Update .env.default * Rename db_server to db_name
historyhall · Jun 26, 2024 · 7114f90 · 7114f90
1 parent ba38c7f
commit 7114f90
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 8 deletions.
diff --git a/packages/deploy/server-release/server/.env.default b/packages/deploy/server-release/server/.env.default
@@ -4,9 +4,9 @@ API_VERSION='0.0.1'
 DB_USERNAME=postgres
 DB_PASSWORD=
 DB_DOMAIN=localhost
-DB_SERVER=hh
+DB_NAME=hh
 DB_PORT=5432
 DB_REJECT_UNAUTHORIZED=false
-DB_LOGGING=true
+DB_LOGGING=false
 
 DEBUG=hh.*
diff --git a/packages/deploy/server-setup/historyhall.org b/packages/deploy/server-setup/historyhall.org
@@ -24,6 +24,18 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 }
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+    server_name db.historyhall.org www.db.historyhall.org;
+    location / {
+        proxy_pass http://localhost:5432;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
 server {
     listen 443 ssl;
     listen [::]:443 ssl;

diff --git a/packages/deploy/server-setup/setup.sh b/packages/deploy/server-setup/setup.sh
@@ -19,6 +19,7 @@ sudo systemctl restart nginx
 sudo certbot --nginx -d historyhall.org -d www.historyhall.org
 sudo certbot --nginx -d registry.historyhall.org -d www.registry.historyhall.org
 sudo certbot --nginx -d api.historyhall.org -d www.api.historyhall.org
+sudo certbot --nginx -d db.historyhall.org -d db.api.historyhall.org
 
 # Docker Registry
 sudo mkdir -p /srv/docker-registry/registry;

diff --git a/packages/migrate/.env.default b/packages/migrate/.env.default
@@ -1,7 +1,7 @@
 DB_USERNAME=postgres
 DB_PASSWORD=
 DB_DOMAIN=localhost
-DB_SERVER=hh
+DB_NAME=hh
 DB_PORT=5432
 DB_REJECT_UNAUTHORIZED=false
 DB_LOGGING=true

diff --git a/packages/migrate/src/core/environment.ts b/packages/migrate/src/core/environment.ts
@@ -7,7 +7,7 @@ export const environment = {
     dbUsername: process.env.DB_USERNAME,
     dbPassword: process.env.DB_PASSWORD,
     dbDomain: process.env.DB_DOMAIN || 'localhost',
-    dbServer: process.env.DB_SERVER || 'hh',
+    dbName: process.env.DB_NAME || 'hh',
     dbPort: process.env.DB_PORT || '5432',
     dbRejectUnauthorized: process.env.DB_REJECT_UNAUTHORIZED === 'true',
     dbLogging: process.env.DB_LOGGING === 'true',

diff --git a/packages/migrate/src/core/mikro-orm.config.ts b/packages/migrate/src/core/mikro-orm.config.ts
@@ -4,7 +4,7 @@ import {PostgreSqlDriver} from "@mikro-orm/postgresql";
 
 const config = {
     entities,
-    clientUrl: `postgres://${environment.dbUsername}:${environment.dbPassword}@${environment.dbDomain}:${environment.dbPort}/${environment.dbServer}`,
+    clientUrl: `postgres://${environment.dbUsername}:${environment.dbPassword}@${environment.dbDomain}:${environment.dbPort}/${environment.dbName}`,
     debug: environment.dbLogging,
     discovery: {
         disableDynamicFileAccess: true,

diff --git a/packages/server/.env.default b/packages/server/.env.default
@@ -4,7 +4,7 @@ API_VERSION='0.0.1'
 DB_USERNAME=postgres
 DB_PASSWORD=
 DB_DOMAIN=localhost
-DB_SERVER=hh
+DB_NAME=hh
 DB_PORT=5432
 DB_REJECT_UNAUTHORIZED=false
 DB_LOGGING=true

diff --git a/packages/server/src/core/environment.ts b/packages/server/src/core/environment.ts
@@ -7,7 +7,7 @@ export const environment = {
     dbUsername: process.env.DB_USERNAME,
     dbPassword: process.env.DB_PASSWORD,
     dbDomain: process.env.DB_DOMAIN || 'localhost',
-    dbServer: process.env.DB_SERVER || 'hh',
+    dbName: process.env.DB_NAME || 'hh',
     dbPort: process.env.DB_PORT || '5432',
     dbRejectUnauthorized: process.env.DB_REJECT_UNAUTHORIZED === 'true',
     dbLogging: process.env.DB_LOGGING === 'true',

diff --git a/packages/server/src/core/mikro-orm.config.ts b/packages/server/src/core/mikro-orm.config.ts
@@ -4,7 +4,7 @@ import {PostgreSqlDriver} from "@mikro-orm/postgresql";
 
 const config = {
     entities,
-    clientUrl: `postgres://${environment.dbUsername}:${environment.dbPassword}@${environment.dbDomain}:${environment.dbPort}/${environment.dbServer}`,
+    clientUrl: `postgres://${environment.dbUsername}:${environment.dbPassword}@${environment.dbDomain}:${environment.dbPort}/${environment.dbName}`,
     debug: environment.dbLogging,
     discovery: {
         disableDynamicFileAccess: true,