added a config setting called root for the correct root url from outside

punkish · May 8, 2020 · 4a4675a · 4a4675a
1 parent e9f1051
commit 4a4675a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/api/v2/resources/rootRoute.js b/api/v2/resources/rootRoute.js
@@ -1,5 +1,8 @@
 'use strict';
 
+const config = require('config');
+const root = config.get('root');
+
 /*************************************************************
  *
  * This is the root of the API. It lists all the routes to the 
@@ -32,7 +35,7 @@ module.exports = {
                             return {
                                 name: name,
                                 description: description,
-                                path: `${server.info.uri}${path}`
+                                path: `${root}${path}`
                             }
                         });
 

diff --git a/config/default.js b/config/default.js
@@ -23,6 +23,7 @@ module.exports = {
 
     // The port can change depending on the server
     port: 3030,
+    root: 'http://localhost:3030',
 
     loglevel: 'INFO',
 

diff --git a/config/production.js b/config/production.js
@@ -7,11 +7,10 @@
  * 
  **************************************************************/
 
-const host = 'https://zenodeo.org';
-
 module.exports = {
 
     loglevel: 'ERROR',
+    root: 'https://zenodeo.org',
 
     v1: {
         uri: {

diff --git a/config/test.js b/config/test.js
@@ -10,6 +10,7 @@
 module.exports = {
 
     loglevel: 'ERROR',
+    root: 'http://z2.punkish.org',
 
     v1: {
         uri: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
     module.exports = {
         loglevel: 'ERROR',
+        root: 'http://z2.punkish.org',
         v1: {
             uri: {
@@ Expand Down @@