From 00a61040e41553df3ac6487867f5cb47b5a2ac72 Mon Sep 17 00:00:00 2001 From: Aitor Urrutia Date: Sat, 15 Jan 2022 13:06:12 +0100 Subject: [PATCH] Update database config --- back/config/env/production/database.js | 19 +++++ back/config/env/production/server.js | 3 + back/database/migrations/development.db | Bin 348160 -> 348160 bytes back/package.json | 6 +- yarn.lock | 88 ++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 back/config/env/production/database.js create mode 100644 back/config/env/production/server.js diff --git a/back/config/env/production/database.js b/back/config/env/production/database.js new file mode 100644 index 0000000..a16f55a --- /dev/null +++ b/back/config/env/production/database.js @@ -0,0 +1,19 @@ +const parse = require("pg-connection-string").parse; +const config = parse(process.env.DATABASE_URL); + +module.exports = ({ env }) => ({ + connection: { + client: "postgres", + connection: { + host: config.host, + port: config.port, + database: config.database, + user: config.user, + password: config.password, + ssl: { + rejectUnauthorized: false, + }, + }, + debug: false, + }, +}); diff --git a/back/config/env/production/server.js b/back/config/env/production/server.js new file mode 100644 index 0000000..a3b4321 --- /dev/null +++ b/back/config/env/production/server.js @@ -0,0 +1,3 @@ +module.exports = ({ env }) => ({ + url: env("MY_HEROKU_URL"), +}); diff --git a/back/database/migrations/development.db b/back/database/migrations/development.db index 122dccc9f0b03fe0f4d663a9b0478a7f71882bf5..629c9a90c48222f4e0aaa737a6c599983ae2969a 100644 GIT binary patch delta 368 zcmYk0!7GDt7{~qI?{79XW`{{l;>3wu2?X|;lSlUt^g)A46 zu(te4EjJg5lEa*oKLBN93BQ$tr#^kZPd$CVkCAa28E4AHZ0Y6!X3Nf$I~mVSb?sTC zdxP-`1D9bRaLjA zN)9>h(M*qbFq8I!QE{C^nvtu7KI;5{SsZ?00yK0EtFWJ9xK?~#VADgjbKE8t&arAD z=cx>6Da(W7SL7{uZhdKU%Vbs3D+&JjidOcJ#4WTZG%*T2qLGX%w2Kk&f+G6g_@#?x zm*gYi7*6agOpaYVleUZ+iY4I?bt`zUXXBJDDTC{&V1t-UpRJEm8!Slr`7|w#Nrl`{9kHI22ryxj$q&yK7Dph delta 385 zcmZozAlk4%bb>S^=R_H2M$U~1zw{WHH%IF);s8?r%o#ZtEt(wK92nain6^1EGbb<_ zOt1aUB(+_}l{JNZdX*U~_jUy{*3T^48+=$Bm<1VtARx6UH?z1nGe565D1W-*cV>mj z1sN>cFK=a5<6_jA&X~j^x_$0P<_^~FKld}wFx;;Ho%tfi^!;0yi??U*WS+=4edjM` z+wHEKm}8l@uyB9i4FZ}O48$Qo96DX`Ds$8H1E-juZ}($n*~_%u?hDH?>FE#7Gb>Er zzmM5yy8jMlq3IJ&GJ8(1*w36WeeMHh-tGS`FhAmB0U0s91ch|C}!Hk+~6{V@dNodu@JF IR%&ty0A13J{r~^~ diff --git a/back/package.json b/back/package.json index 295b66b..308c765 100644 --- a/back/package.json +++ b/back/package.json @@ -11,9 +11,11 @@ }, "devDependencies": {}, "dependencies": { - "@strapi/strapi": "4.0.4", - "@strapi/plugin-users-permissions": "4.0.4", "@strapi/plugin-i18n": "4.0.4", + "@strapi/plugin-users-permissions": "4.0.4", + "@strapi/strapi": "4.0.4", + "pg": "^8.7.1", + "pg-connection-string": "^2.5.0", "sqlite3": "5.0.2" }, "author": { diff --git a/yarn.lock b/yarn.lock index a23a613..93e26ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4264,6 +4264,11 @@ buffer-indexof@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== +buffer-writer@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" + integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw== + buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" @@ -11540,6 +11545,11 @@ package-json@^6.3.0: registry-url "^5.0.0" semver "^6.2.0" +packet-reader@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" + integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== + pako@^1.0.5, pako@~1.0.5: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" @@ -11831,6 +11841,57 @@ pg-connection-string@2.4.0: resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10" integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ== +pg-connection-string@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" + integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== + +pg-int8@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" + integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== + +pg-pool@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c" + integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ== + +pg-protocol@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0" + integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ== + +pg-types@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3" + integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA== + dependencies: + pg-int8 "1.0.1" + postgres-array "~2.0.0" + postgres-bytea "~1.0.0" + postgres-date "~1.0.4" + postgres-interval "^1.1.0" + +pg@^8.7.1: + version "8.7.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz#9ea9d1ec225980c36f94e181d009ab9f4ce4c471" + integrity sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA== + dependencies: + buffer-writer "2.0.0" + packet-reader "1.0.0" + pg-connection-string "^2.5.0" + pg-pool "^3.4.1" + pg-protocol "^1.5.0" + pg-types "^2.1.0" + pgpass "1.x" + +pgpass@1.x: + version "1.0.5" + resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d" + integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug== + dependencies: + split2 "^4.1.0" + phin@^2.9.1: version "2.9.3" resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c" @@ -12195,6 +12256,28 @@ postcss@^8.0.2, postcss@^8.2.15, postcss@^8.2.9, postcss@^8.3.11: picocolors "^1.0.0" source-map-js "^1.0.1" +postgres-array@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" + integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA== + +postgres-bytea@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" + integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU= + +postgres-date@~1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8" + integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q== + +postgres-interval@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695" + integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ== + dependencies: + xtend "^4.0.0" + potrace@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/potrace/-/potrace-2.1.8.tgz#50f6fba92e1e39ddef6f979b0a0f841809e0acf2" @@ -13945,6 +14028,11 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +split2@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809" + integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ== + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"