Commit 0f029cbf authored by Indrek Jentson's avatar Indrek Jentson

Eraldi sisse toodud teenuse url

parent da63e135
var config = require('./global_config/global'); var config = require('./global_config/global');
/* /*
* Teenuse url ilma pordita. Kasutatakse teenuse serverisse installeerimisel teenuse urli moodustamiseks: <url>:<port>/api/v1/ * Teenuse ja serveri url ilma pordita. Kasutatakse teenuse serverisse installeerimisel teenuse urli moodustamiseks: <url>:<port>/api/v1/
*/ */
config.serverUrl = 'http://localhost'; config.serviceUrl = 'http://localhost'; // Docker-compose kontekstis 'http://teenusenimi'
config.serverUrl = 'http://localhost'; // Docker-compose kontekstis 'http://server'
/* /*
* Redis serveri andmed. Kui kasutatakse vaikeseadeid, siis pole vaja muuta * Redis serveri andmed. Kui kasutatakse vaikeseadeid, siis pole vaja muuta
*/ */
//config.redis = { //config.redis = {
// host: process.env.REDIS_PORT_6379_TCP_ADDR || "127.0.0.1", // host: process.env.REDIS_PORT_6379_TCP_ADDR || "127.0.0.1", // Docker-compose kontekstis 'redis'
// port: process.env.REDIS_PORT_6379_TCP_PORT || 6379 // port: process.env.REDIS_PORT_6379_TCP_PORT || 6379
//}; //};
...@@ -18,7 +19,7 @@ config.serverUrl = 'http://localhost'; ...@@ -18,7 +19,7 @@ config.serverUrl = 'http://localhost';
*/ */
//config.integration = [ //config.integration = [
// { // {
// installUrl: 'http://keeleliin.keeleressursid.ee:3000/api/v1/service/install', // installUrl: 'http://keeleliin.keeleressursid.ee:3000/api/v1/service/install', // Docker-compose kontekstis 'http://server:3000/...'
// apiKey: 'server-wrapper-api-key' // apiKey: 'server-wrapper-api-key'
// } // }
//]; //];
......
...@@ -5,6 +5,7 @@ config.redis = { ...@@ -5,6 +5,7 @@ config.redis = {
port: process.env.REDIS_PORT_6379_TCP_PORT || 6379 port: process.env.REDIS_PORT_6379_TCP_PORT || 6379
}; };
config.serviceUrl = 'http://localhost';
config.serverUrl = 'http://localhost'; config.serverUrl = 'http://localhost';
config.integration = [ config.integration = [
......
...@@ -57,7 +57,7 @@ var InstallService = function() { ...@@ -57,7 +57,7 @@ var InstallService = function() {
configuration.sid = wrapper.id; configuration.sid = wrapper.id;
configuration.name = wrapper.title; configuration.name = wrapper.title;
configuration.description = wrapper.description; configuration.description = wrapper.description;
configuration.url = config.serverUrl + ':' + wrapper.port + '/api/v1/'; configuration.url = config.serviceUrl + ':' + wrapper.port + '/api/v1/';
configuration.inputTypes = []; configuration.inputTypes = [];
configuration.outputTypes = []; configuration.outputTypes = [];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment