aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/initializers
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-04-20 15:01:54 +0200
committerChocobozzz <me@florianbigard.com>2021-04-20 15:01:54 +0200
commit4024c44f9027a32809931de0692d40d001df721c (patch)
tree4403f1149143a0c0e7176c30d7077bb648ae4911 /server/initializers
parent46460547caf558d50040acc75b25373ea07fc83c (diff)
parent1c82e4eee3b6ce0edca18157b11aff8d5bf3dacd (diff)
downloadPeerTube-4024c44f9027a32809931de0692d40d001df721c.tar.gz
PeerTube-4024c44f9027a32809931de0692d40d001df721c.tar.zst
PeerTube-4024c44f9027a32809931de0692d40d001df721c.zip
Merge branch 'release/3.1.0' into develop
Diffstat (limited to 'server/initializers')
-rw-r--r--server/initializers/database.ts13
1 files changed, 11 insertions, 2 deletions
diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 4c9d7c610..edf12bc41 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -51,18 +51,27 @@ const dbname = CONFIG.DATABASE.DBNAME
51const username = CONFIG.DATABASE.USERNAME 51const username = CONFIG.DATABASE.USERNAME
52const password = CONFIG.DATABASE.PASSWORD 52const password = CONFIG.DATABASE.PASSWORD
53const host = CONFIG.DATABASE.HOSTNAME 53const host = CONFIG.DATABASE.HOSTNAME
54const ssl = CONFIG.DATABASE.SSL
55const port = CONFIG.DATABASE.PORT 54const port = CONFIG.DATABASE.PORT
56const poolMax = CONFIG.DATABASE.POOL.MAX 55const poolMax = CONFIG.DATABASE.POOL.MAX
57 56
57let dialectOptions: any = {}
58
59if (CONFIG.DATABASE.SSL) {
60 dialectOptions = {
61 ssl: {
62 rejectUnauthorized: false
63 }
64 }
65}
66
58const sequelizeTypescript = new SequelizeTypescript({ 67const sequelizeTypescript = new SequelizeTypescript({
59 database: dbname, 68 database: dbname,
60 dialect: 'postgres', 69 dialect: 'postgres',
70 dialectOptions,
61 host, 71 host,
62 port, 72 port,
63 username, 73 username,
64 password, 74 password,
65 ssl,
66 pool: { 75 pool: {
67 max: poolMax 76 max: poolMax
68 }, 77 },