From 31d40468b87d45fdefeeff6a47b2cb48dbce3c37 Mon Sep 17 00:00:00 2001
From: ncastejon <castejon.nicolas@gmail.com>
Date: Wed, 4 Mar 2020 14:38:11 +0100
Subject: [PATCH] Add the IGN key in .env variables.
---
docker-compose.yml | 1 +
index.js | 3 ++-
package-lock.json | 38 +++++++++++++++++++-------------------
package.json | 2 +-
4 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index d897ecb..d307d20 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
- TECHNICAL_ACCOUNT_USERNAME=${TECHNICAL_ACCOUNT_USERNAME}
- TECHNICAL_ACCOUNT_PASSWORD=${TECHNICAL_ACCOUNT_PASSWORD}
- PROXY_HOST_TARGET=${PROXY_HOST_TARGET}
+ - IGN_KEY=${IGN_KEY}
depends_on:
- redis-sentinel-1
restart: unless-stopped
diff --git a/index.js b/index.js
index 22adefe..8d0a144 100644
--- a/index.js
+++ b/index.js
@@ -14,12 +14,13 @@ const elasticsearchUrl = process.env.ELASTICSEARCH_URL;
const technicalAccountUsername = process.env.TECHNICAL_ACCOUNT_USERNAME;
const technicalAccountPassword = process.env.TECHNICAL_ACCOUNT_PASSWORD;
const proxyHostTarget = process.env.PROXY_HOST_TARGET;
+const ignKey = process.env.IGN_KEY;
// Configuring the different proxy server
// Proxy IGN Ortho
var ingProxy = httpProxy.createProxyServer({
changeOrigin: true,
- target: 'https://wxs.ign.fr/q7kc4me8vbbf4iw7epsfoiy7/geoportail/r/wms/',
+ target: 'https://wxs.ign.fr/' + ignKey + '/geoportail/r/wms/',
});
// Configuring the different proxy server
diff --git a/package-lock.json b/package-lock.json
index 46e2d63..1064f9d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
- "name": "proxy-mvt",
- "version": "1.0.0",
+ "name": "proxy-map-services",
+ "version": "1.0.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -10,7 +10,7 @@
"integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
"requires": {
"follow-redirects": "1.5.10",
- "is-buffer": "2.0.4"
+ "is-buffer": "^2.0.2"
},
"dependencies": {
"debug": {
@@ -26,7 +26,7 @@
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
"requires": {
- "debug": "3.1.0"
+ "debug": "=3.1.0"
}
},
"ms": {
@@ -51,7 +51,7 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"requires": {
- "ms": "2.1.2"
+ "ms": "^2.1.1"
}
},
"denque": {
@@ -69,7 +69,7 @@
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
"integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
"requires": {
- "debug": "3.2.6"
+ "debug": "^3.0.0"
}
},
"http": {
@@ -82,9 +82,9 @@
"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
"integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
"requires": {
- "eventemitter3": "4.0.0",
- "follow-redirects": "1.9.0",
- "requires-port": "1.0.0"
+ "eventemitter3": "^4.0.0",
+ "follow-redirects": "^1.0.0",
+ "requires-port": "^1.0.0"
}
},
"ioredis": {
@@ -92,15 +92,15 @@
"resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.14.1.tgz",
"integrity": "sha512-94W+X//GHM+1GJvDk6JPc+8qlM7Dul+9K+lg3/aHixPN7ZGkW6qlvX0DG6At9hWtH2v3B32myfZqWoANUJYGJA==",
"requires": {
- "cluster-key-slot": "1.1.0",
- "debug": "4.1.1",
- "denque": "1.4.1",
- "lodash.defaults": "4.2.0",
- "lodash.flatten": "4.4.0",
+ "cluster-key-slot": "^1.1.0",
+ "debug": "^4.1.1",
+ "denque": "^1.1.0",
+ "lodash.defaults": "^4.2.0",
+ "lodash.flatten": "^4.4.0",
"redis-commands": "1.5.0",
- "redis-errors": "1.2.0",
- "redis-parser": "3.0.0",
- "standard-as-callback": "2.0.1"
+ "redis-errors": "^1.2.0",
+ "redis-parser": "^3.0.0",
+ "standard-as-callback": "^2.0.1"
},
"dependencies": {
"debug": {
@@ -108,7 +108,7 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
- "ms": "2.1.2"
+ "ms": "^2.1.1"
}
}
}
@@ -158,7 +158,7 @@
"resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
"integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=",
"requires": {
- "redis-errors": "1.2.0"
+ "redis-errors": "^1.0.0"
}
},
"requires-port": {
diff --git a/package.json b/package.json
index 3887be0..4bbb0a5 100644
--- a/package.json
+++ b/package.json
@@ -17,4 +17,4 @@
"ioredis": "^4.14.1",
"url": "^0.11.0"
}
-}
\ No newline at end of file
+}
--
GitLab