Add ssl support to postgresql

diff --git a/config/default.yaml b/config/default.yaml
index a3af1b15f16ec5d0d7401eae32e88966d950329c..0c2d165be89843afea29e3fb5a64c4e325f0711b 100644 (file)
--- 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 c1e7c6c03e944108b3d181d2491d5ae48241d0c5..ca9c16739b87022fc117d6cc5923523de8be1f99 100644 (file)
--- 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 32bd3bbe2aac33134fcc8861d8e696e38f763500..04ba605b698bd2a3e1a81dc127697e52f9257181 100644 (file)
--- 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 5cf5765f681b09ccb63724bf64e8294c46249157..e05e7c3352097c121378d4b4cb9e1c1233217079 100644 (file)
--- 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 a32cf1a89038de64e822b9f6eecaed2b1ecc2baf..6215b9fdfa3864152d357db57a4762209eb62512 100644 (file)
--- 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'