Merge pull request #137 from cephie-studios/canary

Add postgres to allowed hosts in getSSLConfig

Author: EELE14

docker-compose.canary.yml

@@ -1,12 +1,12 @@
-version: '3.8'
+version: "3.8"
 
 services:
   pfcontrol:
     build:
       context: .
       dockerfile: Dockerfile
     ports:
-      - '9902:9902'
+      - "9902:9902"
     environment:
       - NODE_ENV=production
     env_file:

docker-compose.dev.yml

@@ -1,11 +1,11 @@
-version: '3.8'
+version: "3.8"
 
 services:
   postgres:
     image: postgres:16-alpine
     container_name: pfcontrol-postgres-dev
     ports:
-      - '5432:5432'
+      - "5432:5432"
     environment:
       POSTGRES_USER: pfcontrol
       POSTGRES_PASSWORD: pfcontrol
@@ -16,7 +16,7 @@ services:
     networks:
       - pfcontrol-network
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U pfcontrol']
+      test: ["CMD-SHELL", "pg_isready -U pfcontrol"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -25,14 +25,14 @@ services:
     image: redis:7-alpine
     container_name: pfcontrol-redis-dev
     ports:
-      - '6379:6379'
+      - "6379:6379"
     volumes:
       - redis_data:/data
     restart: unless-stopped
     networks:
       - pfcontrol-network
     healthcheck:
-      test: ['CMD', 'redis-cli', 'ping']
+      test: ["CMD", "redis-cli", "ping"]
       interval: 10s
       timeout: 3s
       retries: 5
@@ -42,8 +42,8 @@ services:
       context: .
       dockerfile: Dockerfile.dev
     ports:
-      - '9901:9901'
-      - '5173:5173'
+      - "9901:9901"
+      - "5173:5173"
     environment:
       - NODE_ENV=development
     env_file:

docker-compose.yml

@@ -1,12 +1,12 @@
-version: '3.8'
+version: "3.8"
 
 services:
   pfcontrol:
     build:
       context: .
       dockerfile: Dockerfile
     ports:
-      - '9900:9900'
+      - "9900:9900"
     environment:
       - NODE_ENV=production
     env_file:

package-lock.json

@@ -25,7 +25,10 @@ async function ensureDatabasesExist() {
   const url = new URL(mainDbUrl);
   const baseConnectionString = `postgresql://${url.username}:${url.password}@${url.host}/postgres`;
 
-  const isLocalhost = url.hostname === 'localhost' || url.hostname === '127.0.0.1';
+  const isLocalhost =
+    url.hostname === 'localhost' ||
+    url.hostname === '127.0.0.1' ||
+    url.hostname === 'postgres';
 
   const client = new pg.Client({
     connectionString: baseConnectionString,
@@ -66,7 +69,10 @@ await ensureDatabasesExist();
 
 function getSSLConfig(connectionString: string) {
   const url = new URL(connectionString);
-  const isLocalhost = url.hostname === 'localhost' || url.hostname === '127.0.0.1';
+  const isLocalhost =
+    url.hostname === 'localhost' ||
+    url.hostname === '127.0.0.1' ||
+    url.hostname === 'postgres';
   return isLocalhost ? false : { rejectUnauthorized: false };
 }