From b0ce7c39dce4be8d7c2775e8205f8abfe348a0de Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 24 Aug 2020 11:38:57 +0200
Subject: [PATCH] Add ssl support to postgresql

---
 config/default.yaml                              | 1 +
 config/production.yaml.example                   | 1 +
 server/initializers/config.ts                    | 1 +
 server/initializers/database.ts                  | 2 ++
 support/docker/production/config/production.yaml | 1 +
 5 files changed, 6 insertions(+)

diff --git a/config/default.yaml b/config/default.yaml
index a3af1b15f..0c2d165be 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -37,6 +37,7 @@ trust_proxy:
 database:
   hostname: 'localhost'
   port: 5432
+  ssl: false
   suffix: '_dev'
   username: 'peertube'
   password: 'peertube'
diff --git a/config/production.yaml.example b/config/production.yaml.example
index c1e7c6c03..ca9c16739 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -36,6 +36,7 @@ trust_proxy:
 database:
   hostname: 'localhost'
   port: 5432
+  ssl: false
   suffix: '_prod'
   username: 'peertube'
   password: 'peertube'
diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index 32bd3bbe2..04ba605b6 100644
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -23,6 +23,7 @@ const CONFIG = {
     DBNAME: config.has('database.name') ? config.get<string>('database.name') : 'peertube' + config.get<string>('database.suffix'),
     HOSTNAME: config.get<string>('database.hostname'),
     PORT: config.get<number>('database.port'),
+    SSL: config.get<boolean>('database.ssl'),
     USERNAME: config.get<string>('database.username'),
     PASSWORD: config.get<string>('database.password'),
     POOL: {
diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 5cf5765f6..e05e7c335 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -48,6 +48,7 @@ const dbname = CONFIG.DATABASE.DBNAME
 const username = CONFIG.DATABASE.USERNAME
 const password = CONFIG.DATABASE.PASSWORD
 const host = CONFIG.DATABASE.HOSTNAME
+const ssl = CONFIG.DATABASE.SSL
 const port = CONFIG.DATABASE.PORT
 const poolMax = CONFIG.DATABASE.POOL.MAX
 
@@ -58,6 +59,7 @@ const sequelizeTypescript = new SequelizeTypescript({
   port,
   username,
   password,
+  ssl,
   pool: {
     max: poolMax
   },
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml
index a32cf1a89..6215b9fdf 100644
--- a/support/docker/production/config/production.yaml
+++ b/support/docker/production/config/production.yaml
@@ -30,6 +30,7 @@ trust_proxy:
 database:
   hostname: 'postgres'
   port: 5432
+  ssl: false
   suffix: ''
   username: 'postgres'
   password: 'postgres'
-- 
2.41.0