From 4b5c7038f5fa92aeb40b684773973a3a1fce3e33 Mon Sep 17 00:00:00 2001
From: Roland Bernard <rolbernard@unibz.it>
Date: Mon, 17 May 2021 22:07:19 +0200
Subject: [PATCH] Fixed more problems with the deployment
---
server/package.json | 1 +
server/src/knexconfig.ts | 6 ++++--
server/yarn.lock | 5 +++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/package.json b/server/package.json
index 8218d4d..ebb6e48 100644
--- a/server/package.json
+++ b/server/package.json
@@ -38,6 +38,7 @@
"jest": "^26.6.3",
"nodemon": "^2.0.7",
"sqlite3": "^5.0.2",
+ "tsc": "^2.0.3",
"ts-jest": "^26.5.4",
"ts-node": "^9.1.1",
"typescript": "^4.2.4"
diff --git a/server/src/knexconfig.ts b/server/src/knexconfig.ts
index f607b47..1d88861 100644
--- a/server/src/knexconfig.ts
+++ b/server/src/knexconfig.ts
@@ -1,4 +1,6 @@
+import { env } from 'process';
+
export default {
development: {
client: "sqlite3",
@@ -8,7 +10,7 @@ export default {
},
staging: {
client: "postgresql",
- connection: {
+ connection: env.DATABASE_URL ?? {
database: "ryoko",
user: "postgres",
password: ""
@@ -23,7 +25,7 @@ export default {
},
production: {
client: "postgresql",
- connection: {
+ connection: env.DATABASE_URL ?? {
database: "ryoko",
user: "postgres",
password: ""
diff --git a/server/yarn.lock b/server/yarn.lock
index 401d1f8..ae7177f 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -5183,6 +5183,11 @@ ts-node@^9.1.1:
source-map-support "^0.5.17"
yn "3.1.1"
+tsc@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/tsc/-/tsc-2.0.3.tgz#037fe579e3bd67a5cbdaa604b43c6c1991b04bef"
+ integrity sha512-SN+9zBUtrpUcOpaUO7GjkEHgWtf22c7FKbKCA4e858eEM7Qz86rRDpgOU2lBIDf0fLCsEg65ms899UMUIB2+Ow==
+
tunnel-agent@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
--
GitLab